move LLVM assert subversion to llvm.mk

Liozou · Jan 12, 2021 · 81701f1 · 81701f1
1 parent 4935775
commit 81701f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/deps/Versions.make b/deps/Versions.make
@@ -46,12 +46,8 @@ LIBUV_JLL_NAME := LibUV
 
 # LLVM
 LLVM_VER := 11.0.0
+LLVM_ASSERT_JLL_VER := 11.0.0+4
 LLVM_JLL_NAME := libLLVM
-# We provide a way to subversively swap out which LLVM JLL we pull artifacts from
-ifeq ($(BINARYBUILDER_LLVM_ASSERTS), 1)
-LLVM_JLL_VER := 11.0.0+4
-LLVM_JLL_DOWNLOAD_NAME := libLLVM_assert
-endif
 
 # LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`)
 LLVM_TOOLS_JLL_NAME := LLVM

diff --git a/deps/llvm.mk b/deps/llvm.mk
@@ -623,6 +623,12 @@ update-llvm:
 endif
 else # USE_BINARYBUILDER_LLVM
 
+# We provide a way to subversively swap out which LLVM JLL we pull artifacts from
+ifeq ($(BINARYBUILDER_LLVM_ASSERTS), 1)
+LLVM_JLL_DOWNLOAD_NAME := libLLVM_assert
+LLVM_JLL_VER := $(LLVM_ASSERT_JLL_VER)
+endif
+
 $(eval $(call bb-install,llvm,LLVM,false,true))
 $(eval $(call bb-install,clang,CLANG,false,true))
 $(eval $(call bb-install,llvm-tools,LLVM_TOOLS,false,true))