build: make libunwind linked dynamically (#36697)

Not sure why this was first linked statically, as the commit that introduced this simply had the message "restoring stuff that seems to have been clobbered by the revert of the unintended merge to master". Nearly all other libraries that we use are linked dynamically.
JuliaLang · Jul 27, 2020 · 9267bbf · staticfloat · Sep 21, 2020 · staticfloat
1 parent bb90d64
commit 9267bbf
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 11 deletions.
diff --git a/Make.inc b/Make.inc
@@ -940,17 +940,17 @@ LIBUNWIND:=
 else
 ifeq ($(USE_SYSTEM_LIBUNWIND), 1)
 ifneq ($(OS),Darwin)
-LIBUNWIND:=-lunwind-generic -lunwind
+LIBUNWIND:=-lunwind
 # Only for linux since we want to use not yet released libunwind features
 JCFLAGS+=-DSYSTEM_LIBUNWIND
 JCPPFLAGS+=-DSYSTEM_LIBUNWIND
 endif
 else
 ifeq ($(OS),Darwin)
-LIBUNWIND:=$(build_libdir)/libosxunwind.a
+LIBUNWIND:=-losxunwind
 JCPPFLAGS+=-DLIBOSXUNWIND
 else
-LIBUNWIND:=$(build_libdir)/libunwind-generic.a $(build_libdir)/libunwind.a
+LIBUNWIND:=-lunwind
 endif
 endif
 endif
@@ -1206,12 +1206,12 @@ OSLIBS += -lelf -lkvm -lrt -lpthread
 OSLIBS += -lgcc_s
 
 OSLIBS += -Wl,--export-dynamic -Wl,--version-script=$(JULIAHOME)/src/julia.expmap \
-	$(NO_WHOLE_ARCHIVE) $(LIBUNWIND)
+	$(NO_WHOLE_ARCHIVE)
 endif
 
 ifeq ($(OS), Darwin)
 SHLIB_EXT := dylib
-OSLIBS += -framework CoreFoundation $(LIBUNWIND)
+OSLIBS += -framework CoreFoundation
 WHOLE_ARCHIVE := -Xlinker -all_load
 NO_WHOLE_ARCHIVE :=
 JLDFLAGS :=

diff --git a/Makefile b/Makefile
@@ -181,6 +181,11 @@ endif
 ifeq ($(USE_LLVM_SHLIB),1)
 JL_PRIVATE_LIBS-$(USE_SYSTEM_LLVM) += libLLVM libLLVM-9jl
 endif
+ifeq ($(OS),Darwin)
+JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBUNWIND) += libosxunwind
+else
+JL_PRIVATE_LIBS-$(USE_SYSTEM_LIBUNWIND) += libunwind
+endif
 
 ifeq ($(USE_SYSTEM_LIBM),0)
 JL_PRIVATE_LIBS-$(USE_SYSTEM_OPENLIBM) += libopenlibm

diff --git a/deps/Makefile b/deps/Makefile
@@ -157,7 +157,11 @@ ifneq ($(OS), WINNT)
 DEP_LIBS += libwhich
 endif
 
-DEP_LIBS_STAGED := $(filter-out suitesparse-wrapper osxunwind,$(DEP_LIBS)) # unlist targets that have not been converted to use the staged-install
+# unlist targets that have not been converted to use the staged-install
+DEP_LIBS_STAGED := $(filter-out suitesparse-wrapper,$(DEP_LIBS))
+ifneq ($(USE_BINARYBUILDER_LIBUNWIND),1)
+DEP_LIBS_STAGED := $(filter-out osxunwind,$(DEP_LIBS))
+endif
 
 
 ## Common build target prefixes

diff --git a/deps/Versions.make b/deps/Versions.make
@@ -13,7 +13,7 @@ OPENLIBM_VER = 0.7.0
 OPENLIBM_BB_REL = 0
 UNWIND_VER = 1.3.1
 UNWIND_BB_REL = 4
-OSXUNWIND_VER = 0.0.5
+OSXUNWIND_VER = 0.0.6
 OSXUNWIND_BB_REL = 0
 GMP_VER = 6.2.0
 GMP_BB_REL = 1

diff --git a/deps/checksums/LibOSXUnwind.v0.0.6-0.x86_64-apple-darwin14.tar.gz/md5 b/deps/checksums/LibOSXUnwind.v0.0.6-0.x86_64-apple-darwin14.tar.gz/md5
@@ -0,0 +1 @@
+57ee184943cd407bcb0d19d0f8616565
diff --git a/deps/checksums/LibOSXUnwind.v0.0.6-0.x86_64-apple-darwin14.tar.gz/sha512 b/deps/checksums/LibOSXUnwind.v0.0.6-0.x86_64-apple-darwin14.tar.gz/sha512
@@ -0,0 +1 @@
+b46997d83216da569a2337e4ff7da60e3332c9323b60ce2d9352ea0f84aff1b5d7cc849e20c5de387c422d9cb07b4d064b73a278f11d9dadfa6d2f9b28c5fde2
diff --git a/deps/checksums/libosxunwind-0.0.5.tar.gz/md5 b/deps/checksums/libosxunwind-0.0.5.tar.gz/md5
diff --git a/deps/checksums/libosxunwind-0.0.5.tar.gz/sha512 b/deps/checksums/libosxunwind-0.0.5.tar.gz/sha512
diff --git a/deps/checksums/libosxunwind-0.0.6.tar.gz/md5 b/deps/checksums/libosxunwind-0.0.6.tar.gz/md5
@@ -0,0 +1 @@
+62ce12eb88867fe3974904dbf06fb8e9
diff --git a/deps/checksums/libosxunwind-0.0.6.tar.gz/sha512 b/deps/checksums/libosxunwind-0.0.6.tar.gz/sha512
@@ -0,0 +1 @@
+901d1d0e9826b9e691991932897dac3185cd72e668658a319ba71a7f4ab6ac7ae328aa7e67d4c5cbce1a1b7a306d98a754544e8a7530a82d00406e9e42761425
diff --git a/deps/unwind.mk b/deps/unwind.mk
@@ -109,7 +109,7 @@ UNWIND_BB_NAME := LibUnwind.v$(UNWIND_VER)
 
 $(eval $(call bb-install,unwind,UNWIND,false))
 
-OSXUNWIND_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/LibOSXUnwind-$(OSXUNWIND_VER)-$(OSXUNWIND_BB_REL)
+OSXUNWIND_BB_URL_BASE := https://github.com/JuliaBinaryWrappers/LibOSXUnwind_jll.jl/releases/download/LibOSXUnwind-v$(OSXUNWIND_VER)+$(OSXUNWIND_BB_REL)
 OSXUNWIND_BB_NAME := LibOSXUnwind.v$(OSXUNWIND_VER)
 
 $(eval $(call bb-install,osxunwind,OSXUNWIND,false))

diff --git a/src/Makefile b/src/Makefile
@@ -121,7 +121,7 @@ CLANG_LDFLAGS += -Wl,-undefined,dynamic_lookup
 endif
 
 
-COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS) $(LIBUNWIND)
+COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LIBUNWIND) $(LLVMLINK) $(OSLIBS)
 DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
 RELEASE_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport.a $(COMMON_LIBS)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		b46997d83216da569a2337e4ff7da60e3332c9323b60ce2d9352ea0f84aff1b5d7cc849e20c5de387c422d9cb07b4d064b73a278f11d9dadfa6d2f9b28c5fde2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		901d1d0e9826b9e691991932897dac3185cd72e668658a319ba71a7f4ab6ac7ae328aa7e67d4c5cbce1a1b7a306d98a754544e8a7530a82d00406e9e42761425