From bf0303b6cc719e3b7ecf395a033e5be56d56402e Mon Sep 17 00:00:00 2001 From: Valentin Churavy Date: Thu, 23 Jan 2020 19:49:15 -0500 Subject: [PATCH] Force `clang`-based platforms to choose a cxx ABI MacOS and FreeBSD are `clang` based, and so don't typically care about our cxxstring ABI versioning, but we still build them because it is _possible_ to use `g++` with `libstdc++` on MacOS and FreeBSD, so we still need to build the two versions. For the typical case, however, the julia that is built by `clang` won't care which one you use, and so this ensures that we just download the `cxx11` one by default. --- deps/tools/bb-install.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/tools/bb-install.mk b/deps/tools/bb-install.mk index ece54f681fe138..660d775fd3f7d2 100644 --- a/deps/tools/bb-install.mk +++ b/deps/tools/bb-install.mk @@ -6,10 +6,10 @@ # Auto-detect triplet once, create different versions that we use as defaults below for each BB install target # This is much more efficient than launching `gcc` and `python` once for each BB install target. -BB_TRIPLET_LIBGFORTRAN_CXXABI := $(shell python $(JULIAHOME)/contrib/normalize_triplet.py $(or $(XC_HOST),$(XC_HOST),$(BUILD_MACHINE)) "$(shell $(FC) --version | head -1)" "$(shell echo '\#include ' | $(CXX) $(CXXFLAGS) -x c++ -dM -E - | grep _GLIBCXX_USE_CXX11_ABI | awk '{ print $$3 }' )") -BB_TRIPLET_LIBGFORTRAN := $(subst $(SPACE),-,$(filter-out cxx%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI)))) -BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRANABI_CXXABI)))) -BB_TRIPLET := $(subst $(SPACE),-,$(filter-out cxx%,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI))))) +BB_TRIPLET_GCCABI_CXXABI := $(shell python $(JULIAHOME)/contrib/normalize_triplet.py $(or $(XC_HOST),$(XC_HOST),$(BUILD_MACHINE)) "$(shell $(FC) --version | head -1)" "$(or $(shell echo '\#include ' | $(CXX) $(CXXFLAGS) -x c++ -dM -E - | grep _GLIBCXX_USE_CXX11_ABI | awk '{ print $$3 }' ),1)") +BB_TRIPLET_GCCABI := $(subst $(SPACE),-,$(filter-out cxx%,$(subst -,$(SPACE),$(BB_TRIPLET_GCCABI_CXXABI)))) +BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out gcc%,$(subst -,$(SPACE),$(BB_TRIPLET_GCCABI_CXXABI)))) +BB_TRIPLET := $(subst $(SPACE),-,$(filter-out cxx%,$(filter-out gcc%,$(subst -,$(SPACE),$(BB_TRIPLET_GCCABI_CXXABI))))) define bb-install TRIPLET_VAR := BB_TRIPLET