Fix llvm-tools when installing with LLVM_ASSERTS=1 (JuliaLang#40447)

When installing with `LLVM_ASSERTS=1`, we need our `llvm-tools` to be an assert build as well.
johanmon · Apr 22, 2021 · 15a44e9 · 15a44e9
1 parent 2c88fb7
commit 15a44e9
Show file tree

Hide file tree

Showing 4 changed files with 180 additions and 117 deletions.
diff --git a/contrib/refresh_checksums.mk b/contrib/refresh_checksums.mk
@@ -73,9 +73,11 @@ $(foreach project,$(BB_GCC_EXPANDED_PROJECTS),$(foreach triplet,$(TRIPLETS),$(fo
 $(foreach project,$(BB_CXX_EXPANDED_PROJECTS),$(foreach triplet,$(NON_CLANG_TRIPLETS),$(foreach cxxstring_abi,cxx11 cxx03,$(eval $(call checksum_dep,$(project),$(triplet)-$(cxxstring_abi))))))
 $(foreach project,$(BB_CXX_EXPANDED_PROJECTS),$(foreach triplet,$(CLANG_TRIPLETS),$(eval $(call checksum_dep,$(project),$(triplet)))))
 
-# Special libLLVM_asserts_jll targets
+# Special libLLVM_asserts_jll/LLVM_assert_jll targets
 $(foreach triplet,$(NON_CLANG_TRIPLETS),$(foreach cxxstring_abi,cxx11 cxx03,$(eval $(call checksum_dep,llvm,$(triplet)-$(cxxstring_abi),assert))))
+$(foreach triplet,$(NON_CLANG_TRIPLETS),$(foreach cxxstring_abi,cxx11 cxx03,$(eval $(call checksum_dep,llvm-tools,$(triplet)-$(cxxstring_abi),assert))))
 $(foreach triplet,$(CLANG_TRIPLETS),$(eval $(call checksum_dep,llvm,$(triplet),assert)))
+$(foreach triplet,$(CLANG_TRIPLETS),$(eval $(call checksum_dep,llvm-tools,$(triplet),assert)))
 
 # External stdlibs
 checksum-stdlibs:

diff --git a/deps/Versions.make b/deps/Versions.make
@@ -51,6 +51,7 @@ LLVM_JLL_NAME := libLLVM
 # LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`)
 LLVM_TOOLS_JLL_NAME := LLVM
 LLVM_TOOLS_JLL_VER := 11.0.1+3
+LLVM_TOOLS_ASSERT_JLL_VER := 11.0.1+3
 
 # LLVM libunwind
 LLVMUNWIND_VER := 11.0.1