Skip to content

Be gentler in setting BinaryBuilder makevars #32044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 16, 2019
Merged

Be gentler in setting BinaryBuilder makevars #32044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
caf5a97
Be gentler in setting BinaryBuilder makevars
staticfloat May 16, 2019
5458921
Update Make.inc
staticfloat May 16, 2019
d61498b
Disable `BINARYBUILDER_LLVM_ASSERTS` in `appveyor_build.sh`
staticfloat May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Make.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,20 +982,20 @@ endif
# BinaryBuilder options. We default to "on" for all the projects listed in BB_PROJECTS,
# but only if contrib/normalize_triplet.py works for our requested triplet
ifeq ($(shell python $(JULIAHOME)/contrib/normalize_triplet.py $(or $(XC_HOST),$(XC_HOST),$(BUILD_MACHINE)) >/dev/null 2>/dev/null; echo $$?),0)
USE_BINARYBUILDER := 1
USE_BINARYBUILDER ?= 1
else
ifneq ($(shell python $(JULIAHOME)/contrib/normalize_triplet.py x86_64-linux-gnu),x86_64-linux-gnu)
$(warning python normalize_triplet.py appears to be non-functional, so BinaryBuilder disabled)
endif
USE_BINARYBUILDER := 0
USE_BINARYBUILDER ?= 0
endif

# This is the set of projects that BinaryBuilder dependencies are hooked up for.
BB_PROJECTS := OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 MPFR CURL LIBGIT2 PCRE LIBUV UNWIND DSFMT OBJCONV
$(foreach proj,$(BB_PROJECTS),$(if $(USE_BINARYBUILDER_$(proj)),,$(eval USE_BINARYBUILDER_$(proj) := $(USE_BINARYBUILDER))))
$(foreach proj,$(BB_PROJECTS),$(if $(USE_BINARYBUILDER_$(proj)),,$(eval USE_BINARYBUILDER_$(proj) ?= $(USE_BINARYBUILDER))))

# Use the Assertions build
BINARYBUILDER_LLVM_ASSERTS := 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated, but shouldn't this just look at the LLVM_ASSERTIONS variable?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably? @vchuravy is that just a silly oversight on my part?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I originally had it split out to make switching more explicit. No strong feelings on my part.

BINARYBUILDER_LLVM_ASSERTS ?= 0



Expand Down
3 changes: 2 additions & 1 deletion contrib/windows/appveyor_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ echo "override XC_HOST = $MINGW_ARCH-w64-mingw32" >> Make.user
echo "override JULIA_CPU_TARGET = generic;native" >> Make.user

echo 'USE_BINARYBUILDER = 1' >> Make.user
echo 'BINARYBUILDER_LLVM_ASSERTS = 1' >> Make.user
# This is pending the binaries actually being available
#echo 'BINARYBUILDER_LLVM_ASSERTS = 1' >> Make.user
echo 'FORCE_ASSERTIONS = 1' >> Make.user
echo 'USECCACHE = 1' >> Make.user
echo 'VERBOSE = 1' >> Make.user
Expand Down