From 32b1a0c01d6ab526de0e978d9d30ee18ebe7ced2 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Thu, 15 Sep 2005 16:18:01 +0000 Subject: [PATCH] Moved SHRLIB_LDFLAGS and LOADABLE_SHRLIB_LDFLAGS to CONFIG.gnuCommon. --- configure/CONFIG.gnuCommon | 2 ++ configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu | 3 --- configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu | 3 --- configure/os/CONFIG.linux-x86.linux-x86 | 8 +------- configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu | 3 --- configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu | 5 ----- 6 files changed, 3 insertions(+), 21 deletions(-) diff --git a/configure/CONFIG.gnuCommon b/configure/CONFIG.gnuCommon index ff1fab157..5eddbf804 100644 --- a/configure/CONFIG.gnuCommon +++ b/configure/CONFIG.gnuCommon @@ -49,6 +49,8 @@ STATIC_LDFLAGS_YES = -static STATIC_LDFLAGS_NO = SHRLIB_CFLAGS = -fPIC +SHRLIB_LDFLAGS = -shared -fPIC -h $@ -z defs +LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC -h $@ GNU_LDLIBS_YES = -lgcc diff --git a/configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu b/configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu index af4959831..5c7bf50d9 100644 --- a/configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu +++ b/configure/os/CONFIG.aix-ppc-gnu.aix-ppc-gnu @@ -14,6 +14,3 @@ AR = ar ARFLAGS = rcv RANLIB = ranlib -t -SHRLIB_LDFLAGS = -shared -fPIC -LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC - diff --git a/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu b/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu index 7326bea09..0e4999673 100644 --- a/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu +++ b/configure/os/CONFIG.hpux-parisc-gnu.hpux-parisc-gnu @@ -24,6 +24,3 @@ STATIC_LDLIBS_NO = POSIX_CPPFLAGS_YES += -D_REENTRANT -D_PTHREADS -D_POSIX_C_SOURCE=199506L USR_SYS_LIBS += pthread -# C++ templates need PIC definition also in link phase -SHRLIB_LDFLAGS += -shared -fPIC -LOADABLE_SHRLIB_LDFLAGS += $(SHRLIB_LDFLAGS) diff --git a/configure/os/CONFIG.linux-x86.linux-x86 b/configure/os/CONFIG.linux-x86.linux-x86 index aa2b0e89a..00ab28c37 100644 --- a/configure/os/CONFIG.linux-x86.linux-x86 +++ b/configure/os/CONFIG.linux-x86.linux-x86 @@ -11,11 +11,5 @@ include $(CONFIG)/CONFIG.gnuCommon GNU_DIR = /usr -STATIC_LDFLAGS_YES= -Wl,-Bstatic -STATIC_LDFLAGS_NO= -STATIC_LDLIBS_YES= -Wl,-Bdynamic -STATIC_LDLIBS_NO= - -SHRLIB_LDFLAGS += -shared -fPIC -LOADABLE_SHRLIB_LDFLAGS = -shared -fPIC +#STATIC_CFLAGS_YES= -static diff --git a/configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu b/configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu index 0785c15f5..40f17e2c6 100644 --- a/configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu +++ b/configure/os/CONFIG.solaris-sparc-gnu.solaris-sparc-gnu @@ -19,8 +19,5 @@ STATIC_LDFLAGS_NO= STATIC_LDLIBS_YES= -Wl,-Bdynamic STATIC_LDLIBS_NO= -SHRLIB_LDFLAGS += -shared -fPIC -h $@ -LOADABLE_SHRLIB_LDFLAGS += -shared -fPIC -h $@ - OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload diff --git a/configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu b/configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu index 82e6e8c8f..4bc637ee1 100644 --- a/configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu +++ b/configure/os/CONFIG.solaris-x86-gnu.solaris-x86-gnu @@ -14,8 +14,3 @@ AR = ar -rc RANLIB= LD = ld -r -SHRLIB_LDFLAGS += -shared -fPIC -h $@ -z defs -LOADABLE_SHRLIB_LDFLAGS += -shared -fPIC -h $@ - -OP_SYS_LDFLAGS += -z ignore -z combreloc -z lazyload -