From dfad4e6bb3ee8195bfdfdd3d8595c1a22904f458 Mon Sep 17 00:00:00 2001 From: Fredrik Ekre Date: Mon, 6 May 2019 21:01:37 +0200 Subject: [PATCH] Unconditionally append lib/julia to rpath, fixes #31903. (#31933) (cherry picked from commit 040a3e5a71632190a13b6bb9a5706c0cde3d6e0f) --- Make.inc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Make.inc b/Make.inc index 03b60f17a1cb0..47c8a9adaa15b 100644 --- a/Make.inc +++ b/Make.inc @@ -1001,10 +1001,7 @@ else ifeq ($(OS), Darwin) RPATH_ESCAPED_ORIGIN := $(RPATH_ORIGIN) RPATH_LIB := -Wl,-rpath,'@loader_path/julia/' -Wl,-rpath,'@loader_path/' else - RPATH := -Wl,-rpath,'$$ORIGIN/$(build_libdir_rel)' -Wl,-rpath-link,$(build_shlibdir) -Wl,-z,origin -ifeq ($(OS), FreeBSD) - RPATH += -Wl,-rpath,'$$ORIGIN/$(build_private_libdir_rel)' -endif + RPATH := -Wl,-rpath,'$$ORIGIN/$(build_libdir_rel)' -Wl,-rpath,'$$ORIGIN/$(build_private_libdir_rel)' -Wl,-rpath-link,$(build_shlibdir) -Wl,-z,origin RPATH_ORIGIN := -Wl,-rpath,'$$ORIGIN' -Wl,-z,origin RPATH_ESCAPED_ORIGIN := -Wl,-rpath,'\$$\$$ORIGIN' -Wl,-z,origin -Wl,-rpath-link,$(build_shlibdir) RPATH_LIB := -Wl,-rpath,'$$ORIGIN/julia' -Wl,-rpath,'$$ORIGIN' -Wl,-z,origin