Skip to content

Commit a5ab8c2

Browse files
authored
Merge pull request #39840 from JuliaLang/osxunwind-osx-only
Backport "[build] Fix `full-source-dist` downloading LibOSXUnwind..." to release-1.5
2 parents 4b0a7e3 + cf4a626 commit a5ab8c2

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

deps/Makefile

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,17 @@ install: $(addprefix install-, $(DEP_LIBS))
178178
cleanall: $(addprefix clean-, $(DEP_LIBS))
179179
distcleanall: $(addprefix distclean-, $(DEP_LIBS))
180180
rm -rf $(build_prefix)
181-
getall: get-llvm get-libuv get-pcre get-openlibm get-dsfmt get-openblas get-lapack get-suitesparse get-unwind get-osxunwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-curl get-libgit2 get-libwhich
181+
getall: get-llvm get-libuv get-pcre get-openlibm get-dsfmt get-openblas get-lapack get-suitesparse get-unwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-curl get-libgit2 get-libwhich
182+
183+
# If we're building for MacOS, no matter what, `getall` should include `osxunwind`
184+
ifeq ($(OS),Darwin)
185+
getall: get-osxunwind
186+
endif
187+
188+
# Same if we're building a purely-source archive, always include `osxunwind`
189+
ifeq ($(USE_BINARYBUILDER_OSXUNWIND),0)
190+
getall: get-osxunwind
191+
endif
182192

183193
include $(SRCDIR)/llvm.mk
184194
include $(SRCDIR)/libuv.mk

0 commit comments

Comments
 (0)