Skip to content

Commit

Permalink
Unconditionally append lib/julia to rpath, fixes #31903.
Browse files Browse the repository at this point in the history
  • Loading branch information
fredrikekre committed May 6, 2019
1 parent f189ae4 commit fa47ddc
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1034,9 +1034,7 @@ else ifeq ($(OS), Darwin)
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_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
Expand Down

0 comments on commit fa47ddc

Please sign in to comment.