From 6c205869f6c60d71240b638d18fdbbe6c3812875 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Tue, 13 Jul 2004 19:35:20 +0000 Subject: [PATCH] Put all -R directories in RUNTIME_LDFLAGS. --- configure/os/CONFIG.Common.solaris-sparc-gnu | 3 ++- configure/os/CONFIG.Common.solaris-x86 | 3 ++- configure/os/CONFIG.Common.solaris-x86-gnu | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure/os/CONFIG.Common.solaris-sparc-gnu b/configure/os/CONFIG.Common.solaris-sparc-gnu index 6d297404c..38bf31476 100644 --- a/configure/os/CONFIG.Common.solaris-sparc-gnu +++ b/configure/os/CONFIG.Common.solaris-sparc-gnu @@ -16,5 +16,6 @@ COMPILER_CPPFLAGS = -D_REENTRANT OP_SYS_LDLIBS_8 = -lc OP_SYS_LDLIBS_9 = -lc -OP_SYS_LDFLAGS += -R$(GNU_LIB) -L$(GNU_LIB) +RUNTIME_LDFLAGS += -R$(GNU_LIB) +OP_SYS_LDFLAGS += -L$(GNU_LIB) diff --git a/configure/os/CONFIG.Common.solaris-x86 b/configure/os/CONFIG.Common.solaris-x86 index 026f97100..7fba774c8 100644 --- a/configure/os/CONFIG.Common.solaris-x86 +++ b/configure/os/CONFIG.Common.solaris-x86 @@ -30,6 +30,7 @@ ARCH_DEP_CPPFLAGS = -D_X86_ # Set runtime path for shared libraries RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-R%) +RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY)) ifeq ($(BUILD_CLASS),CROSS) GNU_TARGET=x86-sun-solaris2 @@ -45,7 +46,7 @@ OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION)) # Definitions used when COMMANDLINE_LIBRARY is READLINE GNU_DIR = /opt/gnu INCLUDES_READLINE = -I$(GNU_DIR)/include -LDFLAGS_READLINE += -R$(GNU_DIR)/lib +RUNTIME_LDFLAGS_READLINE += -R$(GNU_DIR)/lib LDFLAGS_READLINE += -L$(GNU_DIR)/lib LDLIBS_READLINE = -lreadline -lcurses # Use archive if there is a problem with the readline shared library diff --git a/configure/os/CONFIG.Common.solaris-x86-gnu b/configure/os/CONFIG.Common.solaris-x86-gnu index c7e58cabd..2b67020a7 100644 --- a/configure/os/CONFIG.Common.solaris-x86-gnu +++ b/configure/os/CONFIG.Common.solaris-x86-gnu @@ -15,5 +15,6 @@ COMPILER_CPPFLAGS = -D_REENTRANT OP_SYS_LDLIBS_8 = -lc OP_SYS_LDLIBS_9 = -lc -OP_SYS_LDFLAGS += -R$(GNU_LIB) -L$(GNU_LIB) +RUNTIME_LDFLAGS += -R$(GNU_LIB) +OP_SYS_LDFLAGS += -L$(GNU_LIB)