Skip to content

Commit 040a3e5

Browse files
authored
Unconditionally append lib/julia to rpath, fixes #31903. (#31933)
1 parent aa7ae5a commit 040a3e5

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

Make.inc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,10 +1033,7 @@ else ifeq ($(OS), Darwin)
10331033
RPATH_ESCAPED_ORIGIN := $(RPATH_ORIGIN)
10341034
RPATH_LIB := -Wl,-rpath,'@loader_path/julia/' -Wl,-rpath,'@loader_path/'
10351035
else
1036-
RPATH := -Wl,-rpath,'$$ORIGIN/$(build_libdir_rel)' -Wl,-rpath-link,$(build_shlibdir) -Wl,-z,origin
1037-
ifeq ($(OS), FreeBSD)
1038-
RPATH += -Wl,-rpath,'$$ORIGIN/$(build_private_libdir_rel)'
1039-
endif
1036+
RPATH := -Wl,-rpath,'$$ORIGIN/$(build_libdir_rel)' -Wl,-rpath,'$$ORIGIN/$(build_private_libdir_rel)' -Wl,-rpath-link,$(build_shlibdir) -Wl,-z,origin
10401037
RPATH_ORIGIN := -Wl,-rpath,'$$ORIGIN' -Wl,-z,origin
10411038
RPATH_ESCAPED_ORIGIN := -Wl,-rpath,'\$$\$$ORIGIN' -Wl,-z,origin -Wl,-rpath-link,$(build_shlibdir)
10421039
RPATH_LIB := -Wl,-rpath,'$$ORIGIN/julia' -Wl,-rpath,'$$ORIGIN' -Wl,-z,origin

0 commit comments

Comments
 (0)