Don't introduce spurious libLLVM dependency into julia binary (JuliaLang#17486)

Keno · tkelman · commit c7ca31950919 · 2016-07-19T05:45:10.000-07:00
* Don't introduce spurious libLLVM dependency into julia binary This causes problems with the new RPATH handling since we now omit lib/julia from the executable's RPATH. Fix this by not forcing the executable to link against libLLVM, since we don't require it. Fixes JuliaLang#17484. * Provide link-time rpath Unlike ld.so, ld does not understand `$ORIGIN`, so provide the full path to it at link time to make sure it can find the appropriate dependencies.
diff --git a/Make.inc b/Make.inc
@@ -846,7 +846,7 @@ else ifeq ($(OS), Darwin)
   RPATH_ORIGIN := -Wl,-rpath,'@loader_path/'
   RPATH_LIB := -Wl,-rpath,'@loader_path/' -Wl,-rpath,'@loader_path/julia/'
 else
-  RPATH := -Wl,-rpath,'$$ORIGIN/$(build_libdir_rel)' -Wl,-z,origin
+  RPATH := -Wl,-rpath,'$$ORIGIN/$(build_libdir_rel)' -Wl,-rpath-link,$(build_shlibdir) -Wl,-z,origin
   RPATH_ORIGIN := -Wl,-rpath,'$$ORIGIN' -Wl,-z,origin
   RPATH_LIB := -Wl,-rpath,'$$ORIGIN' -Wl,-rpath,'$$ORIGIN/julia' -Wl,-z,origin
 endif
diff --git a/ui/Makefile b/ui/Makefile
@@ -23,21 +23,7 @@ OBJS := $(SRCS:%=$(BUILDDIR)/%.o)
 DOBJS := $(SRCS:%=$(BUILDDIR)/%.dbg.obj)
 DEBUGFLAGS += $(FLAGS)
 SHIPFLAGS += $(FLAGS)
-
-ifeq ($(USE_LLVM_SHLIB),1)
-ifeq ($(LLVM_USE_CMAKE),1)
-LLVMLINK := $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
-else
-ifeq ($(OS),WINNT)
-LLVMLINK := $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT)
-else
-LLVMLINK := $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version)
-endif # OS == WINNT
-endif # LLVM_USE_CMAKE == 1
-else
-LLVMLINK :=
-endif # USE_LLVM_SHLIB == 1
-JLDFLAGS += $(LDFLAGS) $(NO_WHOLE_ARCHIVE) $(OSLIBS) $(LLVMLINK) $(RPATH)
+JLDFLAGS += $(LDFLAGS) $(NO_WHOLE_ARCHIVE) $(OSLIBS) $(RPATH)
 
 ifeq ($(USE_SYSTEM_LIBM),0)
 ifneq ($(UNTRUSTED_SYSTEM_LIBM),0)
