epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Shared lib rpath should not depend on whether or not static libs are also being built.

Browse Source
This commit is contained in:
Bruce Hill
2019-09-11 00:24:19 -07:00
parent 17aaf50136
commit 03268bc683
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure/os/CONFIG.Common.linuxCommon
+3 -3
View File
@@ -23,10 +23,10 @@ STATIC_LDFLAGS_YES= -Wl,-Bstatic
STATIC_LDFLAGS_NO=
STATIC_LDLIBS_YES= -Wl,-Bdynamic
# Set runtime path for shared libraries if USE_RPATH=YES and STATIC_BUILD=NO
SHRLIBDIR_RPATH_LDFLAGS_YES_NO = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
# Set runtime path for shared libraries if USE_RPATH=YES
SHRLIBDIR_RPATH_LDFLAGS_YES = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
SHRLIBDIR_LDFLAGS += \
$(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
$(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
# Set runtime path for products if USE_RPATH=YES and STATIC_BUILD=NO
PRODDIR_RPATH_LDFLAGS_YES_NO = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)