Defines fullpath name only for rpath and -R dirs on link lines.

This commit is contained in:
Janet B. Anderson
2004-04-29 17:47:34 +00:00
parent cab998f40d
commit 7a920f831d
5 changed files with 10 additions and 6 deletions

View File

@@ -17,8 +17,12 @@ VALID_BUILDS = Host Ioc
GNU_DIR = /usr/local
#-------------------------------------------------------
SHRLIB_SEARCH_DIRS := $(foreach dir,$(SHRLIB_SEARCH_DIRS), \
$(shell perl $(TOOLS)/fullPathName.pl $(dir)))
FULLPATHTOP= $(shell perl $(TOOLS)/fullPathName.pl $(TOP))
# Get fullpathname of modules relative to TOP
SHRLIB_SEARCH_FULLPATHTOP = $(SHRLIB_SEARCH_DIRS:$(TOP)/%=$(FULLPATHTOP)/%)
# Get fullpathname of other relative dirs
SHRLIB_SEARCH_FULLPATHDIRS = $(SHRLIB_SEARCH_FULLPATHTOP:.%= \
$(shell perl $(TOOLS)/fullPathName.pl .%)
#-------------------------------------------------------
# Unix prefix and suffix definitions

View File

@@ -26,7 +26,7 @@ LOADABLE_SHRLIB_SUFFIX = .sl
# Set runtime path for shared libraries
empty:= # trick from the make docs...
space:= $(empty) $(empty)
RUNTIME_LDFLAGS = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_DIRS))),+s
RUNTIME_LDFLAGS = -Wl,+b$(subst $(space),:,$(sort $(SHRLIB_SEARCH_FULLPATHDIRS))),+s
ifeq ($(BUILD_CLASS),CROSS)
GNU_TARGET=parisc-hp-unix

View File

@@ -28,7 +28,7 @@ OP_SYS_CPPFLAGS += -DSOLARIS=$(SOLARIS_VERSION) $(COMPILER_CPPFLAGS)
OP_SYS_LDFLAGS += $(COMPILER_LDFLAGS)
# Set runtime path for shared libraries
RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%)
RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-R%)
ifeq ($(BUILD_CLASS),CROSS)
GNU_TARGET=sparc-sun-solaris2

View File

@@ -29,7 +29,7 @@ OP_SYS_LDFLAGS += $(COMPILER_LDFLAGS)
ARCH_DEP_CPPFLAGS = -D_X86_
# Set runtime path for shared libraries
RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-R%)
RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-R%)
ifeq ($(BUILD_CLASS),CROSS)
GNU_TARGET=x86-sun-solaris2

View File

@@ -28,7 +28,7 @@ ARCH_DEP_CPPFLAGS += -D_X86_
OP_SYS_CPPFLAGS += -DCYGWIN32 -U_WIN32
# Set runtime path for shared libraries
RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_DIRS:%=-Wl,-rpath,%)
RUNTIME_LDFLAGS = $(SHRLIB_SEARCH_FULLPATHDIRS:%=-Wl,-rpath,%)
LDLIBS_READLINE = -lcygreadline5 -lcygcurses7