Skip to content

Commit 15a44e9

Browse files
authored
Fix llvm-tools when installing with LLVM_ASSERTS=1 (#40447)
When installing with `LLVM_ASSERTS=1`, we need our `llvm-tools` to be an assert build as well.
1 parent 2c88fb7 commit 15a44e9

File tree

4 files changed

+180
-117
lines changed

4 files changed

+180
-117
lines changed

contrib/refresh_checksums.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,11 @@ $(foreach project,$(BB_GCC_EXPANDED_PROJECTS),$(foreach triplet,$(TRIPLETS),$(fo
7373
$(foreach project,$(BB_CXX_EXPANDED_PROJECTS),$(foreach triplet,$(NON_CLANG_TRIPLETS),$(foreach cxxstring_abi,cxx11 cxx03,$(eval $(call checksum_dep,$(project),$(triplet)-$(cxxstring_abi))))))
7474
$(foreach project,$(BB_CXX_EXPANDED_PROJECTS),$(foreach triplet,$(CLANG_TRIPLETS),$(eval $(call checksum_dep,$(project),$(triplet)))))
7575

76-
# Special libLLVM_asserts_jll targets
76+
# Special libLLVM_asserts_jll/LLVM_assert_jll targets
7777
$(foreach triplet,$(NON_CLANG_TRIPLETS),$(foreach cxxstring_abi,cxx11 cxx03,$(eval $(call checksum_dep,llvm,$(triplet)-$(cxxstring_abi),assert))))
78+
$(foreach triplet,$(NON_CLANG_TRIPLETS),$(foreach cxxstring_abi,cxx11 cxx03,$(eval $(call checksum_dep,llvm-tools,$(triplet)-$(cxxstring_abi),assert))))
7879
$(foreach triplet,$(CLANG_TRIPLETS),$(eval $(call checksum_dep,llvm,$(triplet),assert)))
80+
$(foreach triplet,$(CLANG_TRIPLETS),$(eval $(call checksum_dep,llvm-tools,$(triplet),assert)))
7981

8082
# External stdlibs
8183
checksum-stdlibs:

deps/Versions.make

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ LLVM_JLL_NAME := libLLVM
5151
# LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`)
5252
LLVM_TOOLS_JLL_NAME := LLVM
5353
LLVM_TOOLS_JLL_VER := 11.0.1+3
54+
LLVM_TOOLS_ASSERT_JLL_VER := 11.0.1+3
5455

5556
# LLVM libunwind
5657
LLVMUNWIND_VER := 11.0.1

0 commit comments

Comments
 (0)