Skip to content

Commit

Permalink
Force clang-based platforms to choose a cxx ABI
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
vchuravy committed Jan 24, 2020
1 parent 22fda2f commit a741e81
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions deps/tools/bb-install.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
# 4 cxx11) # signifies a cxx11 ABI dependency

# 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 <string>' | $(CXX) $(CXXFLAGS) -x c++ -dM -E - | grep _GLIBCXX_USE_CXX11_ABI | awk '{ print $$3 }' )")
BB_TRIPLET_LIBGFORTRAN_CXXABI := $(shell python $(JULIAHOME)/contrib/normalize_triplet.py $(or $(XC_HOST),$(XC_HOST),$(BUILD_MACHINE)) "$(shell $(FC) --version | head -1)" "$(or $(shell echo '\#include <string>' | $(CXX) $(CXXFLAGS) -x c++ -dM -E - | grep _GLIBCXX_USE_CXX11_ABI | awk '{ print $$3 }' ),1)")
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_LIBGFORTRAN_CXXABI))))
BB_TRIPLET := $(subst $(SPACE),-,$(filter-out cxx%,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI)))))
Expand Down

0 comments on commit a741e81

Please sign in to comment.