From 0fc52db97b0f764e68d03258c757a149635a110f Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Mon, 4 Aug 2003 18:35:50 +0000 Subject: [PATCH] Always build dynamic library search paths into executable. --- configure/os/CONFIG.Common.hpux-parisc | 3 +-- configure/os/CONFIG.Common.linux-mpc82xx | 3 +-- configure/os/CONFIG.Common.linux-x86 | 3 +-- configure/os/CONFIG.Common.solaris-sparc | 3 +-- configure/os/CONFIG.Common.solaris-x86 | 3 +-- configure/os/CONFIG.Common.sun4-x86 | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/configure/os/CONFIG.Common.hpux-parisc b/configure/os/CONFIG.Common.hpux-parisc index 07a29c025..c886c3ad0 100644 --- a/configure/os/CONFIG.Common.hpux-parisc +++ b/configure/os/CONFIG.Common.hpux-parisc @@ -27,8 +27,7 @@ LOADABLE_SHRLIB_PREFIX = # Set runtime path for shared libraries empty:= # trick from the make docs... space:= $(empty) $(empty) -RUNTIME_LDFLAGS_YES = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_DIRS))),+s -RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES)) +RUNTIME_LDFLAGS = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_DIRS))),+s ifdef CROSS GNU_TARGET=parisc-hp-unix diff --git a/configure/os/CONFIG.Common.linux-mpc82xx b/configure/os/CONFIG.Common.linux-mpc82xx index d5390134b..4bf113939 100644 --- a/configure/os/CONFIG.Common.linux-mpc82xx +++ b/configure/os/CONFIG.Common.linux-mpc82xx @@ -27,8 +27,7 @@ OP_SYS_LDLIBS = -lrt #ARCH_DEP_CPPFLAGS += -D_X86_ # Set runtime path for shared libraries -RUNTIME_LDFLAGS_YES = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%) -RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES)) +RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%) ifdef CROSS GNU_TARGET=ppc_82xx diff --git a/configure/os/CONFIG.Common.linux-x86 b/configure/os/CONFIG.Common.linux-x86 index bd3e7c198..330fa692c 100644 --- a/configure/os/CONFIG.Common.linux-x86 +++ b/configure/os/CONFIG.Common.linux-x86 @@ -28,8 +28,7 @@ ARCH_DEP_CPPFLAGS += -D_X86_ ARCH_DEP_CFLAGS += -mcpu=pentium # Set runtime path for shared libraries -RUNTIME_LDFLAGS_YES = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%) -RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES)) +RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%) ifdef CROSS GNU_TARGET=i586-pc-linux-gnu diff --git a/configure/os/CONFIG.Common.solaris-sparc b/configure/os/CONFIG.Common.solaris-sparc index c1d7532ff..f8443b3c4 100644 --- a/configure/os/CONFIG.Common.solaris-sparc +++ b/configure/os/CONFIG.Common.solaris-sparc @@ -28,8 +28,7 @@ POSIX_LDLIBS_YES += -lposix4 -lpthread $(POSIX_LDLIBS_YES_$(SOLARIS_VERSION)) OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) # Set runtime path for shared libraries -RUNTIME_LDFLAGS_YES = $(SHRLIB_SEARCH_DIRS:%=-R%) -RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES)) +RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%) ifdef CROSS GNU_TARGET=sparc-sun-solaris2 diff --git a/configure/os/CONFIG.Common.solaris-x86 b/configure/os/CONFIG.Common.solaris-x86 index c47aa5612..20d5c1842 100644 --- a/configure/os/CONFIG.Common.solaris-x86 +++ b/configure/os/CONFIG.Common.solaris-x86 @@ -29,8 +29,7 @@ OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) ARCH_DEP_CPPFLAGS = -D_X86_ # Set runtime path for shared libraries -RUNTIME_LDFLAGS_YES = $(SHRLIB_SEARCH_DIRS:%=-R%) -RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES)) +RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%) ifdef CROSS GNU_TARGET=x86-sun-solaris2 diff --git a/configure/os/CONFIG.Common.sun4-x86 b/configure/os/CONFIG.Common.sun4-x86 index 15d691317..ae6526f77 100644 --- a/configure/os/CONFIG.Common.sun4-x86 +++ b/configure/os/CONFIG.Common.sun4-x86 @@ -24,8 +24,7 @@ OP_SYS_CPPFLAGS = -DSUNOS4 ARCH_DEP_CPPFLAGS += -D_X86_ # Set runtime path for shared libraries -RUNTIME_LDFLAGS_YES = $(SHRLIB_SEARCH_DIRS:%=-R%) -RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(SHARED_LIBRARIES)) +RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%) ifdef CROSS GNU_TARGET=x86-sun-sunos4