Put all -R directories in RUNTIME_LDFLAGS.
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user