From 515a5ce658088522a60bcf731c1b435cd75c99e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Fri, 29 Apr 2022 10:06:45 +0100 Subject: [PATCH] [deps] Fix compillation of LLVM with system zlib (#45119) (cherry picked from commit 5e74df5f0ee91c66b95e92c35de65bb02d3e6e9e) --- deps/llvm.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deps/llvm.mk b/deps/llvm.mk index 5afef0b83ba3c..19b684f709dd0 100644 --- a/deps/llvm.mk +++ b/deps/llvm.mk @@ -233,10 +233,14 @@ $$(LLVM_BUILDDIR_withtype)/build-compiled: $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patc LLVM_PATCH_PREV := $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied endef +ifeq ($(USE_SYSTEM_ZLIB), 0) +$(LLVM_BUILDDIR_withtype)/build-configured: | $(build_prefix)/manifest/zlib +endif + # NOTE: LLVM 12 and 13 have their patches applied to JuliaLang/llvm-project # declare that all patches must be applied before running ./configure -$(LLVM_BUILDDIR_withtype)/build-configured: | $(LLVM_PATCH_PREV) $(build_prefix)/manifest/zlib +$(LLVM_BUILDDIR_withtype)/build-configured: | $(LLVM_PATCH_PREV) $(LLVM_BUILDDIR_withtype)/build-configured: $(SRCCACHE)/$(LLVM_SRC_DIR)/source-extracted | $(llvm_python_workaround) mkdir -p $(dir $@)