diff --git a/configure/os/CONFIG.Common.solaris-sparc b/configure/os/CONFIG.Common.solaris-sparc index c07a782bd..431b62b5a 100644 --- a/configure/os/CONFIG.Common.solaris-sparc +++ b/configure/os/CONFIG.Common.solaris-sparc @@ -35,8 +35,6 @@ SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)) PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-R%) PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)) -RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY)) - GNU_TARGET=sparc-sun-solaris2 STLPORT_CFLAGS_YES= -library=stlport4 @@ -61,9 +59,9 @@ OP_SYS_LDLIBS += $(OP_SYS_LDLIBS_$(SOLARIS_VERSION)) # Definitions used when COMMANDLINE_LIBRARY is READLINE READLINE_DIR = $(GNU_DIR) INCLUDES_READLINE = -I$(READLINE_DIR)/include -RUNTIME_LDFLAGS_READLINE += -R$(READLINE_DIR)/lib +RUNTIME_LDFLAGS_READLINE_YES += -R$(READLINE_DIR)/lib +RUNTIME_LDFLAGS_READLINE += $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)) LDFLAGS_READLINE += -L$(READLINE_DIR)/lib LDLIBS_READLINE = -lreadline -lcurses # Use archive if there is a problem with the readline shared library #LDLIBS_READLINE = -Bstatic -lreadline -Bdynamic -lcurses - diff --git a/configure/os/CONFIG.Common.solaris-x86 b/configure/os/CONFIG.Common.solaris-x86 index 8c441585a..e47712e31 100644 --- a/configure/os/CONFIG.Common.solaris-x86 +++ b/configure/os/CONFIG.Common.solaris-x86 @@ -36,8 +36,6 @@ SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)) PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-R%) PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)) -RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY)) - GNU_TARGET=x86-sun-solaris2 STLPORT_CFLAGS_YES= -library=stlport4 @@ -61,7 +59,8 @@ OP_SYS_LDLIBS += $(STLPORT_LDLIBS_$(USE_STLPORT)) # Definitions used when COMMANDLINE_LIBRARY is READLINE READLINE_DIR = $(GNU_DIR) INCLUDES_READLINE = -I$(READLINE_DIR)/include -RUNTIME_LDFLAGS_READLINE += -R$(READLINE_DIR)/lib +RUNTIME_LDFLAGS_READLINE_YES += -R$(READLINE_DIR)/lib +RUNTIME_LDFLAGS_READLINE += $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)) LDFLAGS_READLINE += -L$(READLINE_DIR)/lib LDLIBS_READLINE = -lreadline -lcurses # Use archive if there is a problem with the readline shared library