Skip to content

Commit 40b5fa0

Browse files
committed
Eliminate BINARYBUILDER_LLVM_ASSERTS, just use LLVM_ASSERTS
1 parent 38b7e70 commit 40b5fa0

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

Make.inc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,11 +1044,6 @@ $(foreach proj,$(BB_PROJECTS),$(eval $(call SET_BB_DEFAULT,$(proj))))
10441044

10451045

10461046

1047-
# Use the Assertions build
1048-
BINARYBUILDER_LLVM_ASSERTS ?= 0
1049-
1050-
1051-
10521047
# OS specific stuff
10531048

10541049
# install_name_tool

deps/llvm.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,12 +495,12 @@ update-llvm:
495495
git pull --ff-only
496496
endif
497497
else # USE_BINARYBUILDER_LLVM
498-
ifneq ($(BINARYBUILDER_LLVM_ASSERTS), 1)
498+
ifneq ($(LLVM_ASSERTIONS), 1)
499499
LLVM_BB_NAME := LLVM.v$(LLVM_VER)
500500
LLVM_BB_URL_BASE := https://github.com/JuliaBinaryWrappers/LLVM_jll.jl/releases/download/LLVM-v$(LLVM_VER)+$(LLVM_BB_REL)
501501
else
502-
LLVM_BB_NAME := LLVM_asserts.v$(LLVM_VER)
503-
LLVM_BB_URL_BASE := https://github.com/JuliaBinaryWrappers/LLVM_asserts_jll.jl/releases/download/LLVM-v$(LLVM_VER)+$(LLVM_BB_REL)
502+
LLVM_BB_NAME := LLVM_assert.v$(LLVM_VER)
503+
LLVM_BB_URL_BASE := https://github.com/JuliaBinaryWrappers/LLVM_assert_jll.jl/releases/download/LLVM_assert-v$(LLVM_VER)+$(LLVM_BB_REL)
504504
endif
505505

506506
$(eval $(call bb-install,llvm,LLVM,false,true))

0 commit comments

Comments
 (0)