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

configure: fail hard if RPATH ORIGIN requested, but makeRPath errors out (#890)

Browse Source 
* configure: fail hard if RPATH ORIGIN requested, but makeRPath errors out

The $(shell ...) construct stores the numeric exit code in
$(.SHELLSTATUS).  Map zero to empty string, so that
non-zero values select $(error ...).
This commit is contained in:
mdavidsaver authored and Dirk Zimoch committed 2026-10-14 11:11:42 +02:00
1 parent 2fdfb4cde0
commit 354fc5b757
1 file changed
+4 -2
Download Patch File Download Diff File Expand all files Collapse all files
configure/os/CONFIG.Common.linuxCommon
+4 -2
View File
@@ -25,13 +25,15 @@ STATIC_LDLIBS_YES= -Wl,-Bdynamic
# Set runtime path for shared libraries if LINKER_USE_RPATH=YES
SHRLIBDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)) $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
SHRLIBDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(SHRLIB_DEPLIB_DIRS))
SHRLIBDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(SHRLIB_DEPLIB_DIRS)) \
$(if $(filter-out 0,$(.SHELLSTATUS)), $(error $(MAKERPATH) failed))
SHRLIBDIR_LDFLAGS += \
$(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
# Set runtime path for products if LINKER_USE_RPATH=YES
PRODDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)) $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
PRODDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(PROD_DEPLIB_DIRS))
PRODDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(PROD_DEPLIB_DIRS)) \
$(if $(filter-out 0,$(.SHELLSTATUS)), $(error $(MAKERPATH) failed))
PRODDIR_LDFLAGS += \
$(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))