handle CXX expanded BB builds

Author: vchuravy

contrib/refresh_bb_tarballs.sh

@@ -13,7 +13,8 @@ TRIPLETS="i686-linux-gnu x86_64-linux-gnu aarch64-linux-gnu arm-linux-gnueabihf
 
 # These are the projects currently using BinaryBuilder; both GCC-expanded and non-GCC-expanded:
 BB_PROJECTS="gmp mbedtls libssh2 mpfr curl libgit2 pcre libuv unwind osxunwind dsfmt objconv p7zip zlib suitesparse openlibm"
-BB_GCC_EXPANDED_PROJECTS="llvm openblas"
+BB_GCC_EXPANDED_PROJECTS="openblas"
+BB_CXX_EXPANDED_PROJECTS="llvm"
 
 # If we've been given a project name, filter down to that one:
 if [ -n "${1}" ]; then
@@ -25,6 +26,10 @@ if [ -n "${1}" ]; then
         *${1}*) BB_GCC_EXPANDED_PROJECTS="${1}" ;;
         *) BB_GCC_EXPANDED_PROJECTS="" ;;
     esac
+    case "${BB_CXX_EXPANDED_PROJECTS}" in
+        *${1}*) BB_CXX_EXPANDED_PROJECTS="${1}" ;;
+        *) BB_CXX_EXPANDED_PROJECTS="" ;;
+    esac
 fi
 
 # Get "contrib/" directory path
@@ -45,4 +50,12 @@ for triplet in ${TRIPLETS}; do
 		    make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${libgfortran} BB_TRIPLET_CXXABI=${triplet} install-${proj}
         done
     done
+
+    for proj in ${BB_CXX_EXPANDED_PROJECTS}; do
+		PROJ="$(echo ${proj} | tr [a-z] [A-Z])"
+        for cxx in cxx03 cxx11; do
+		    make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${cxx} BB_TRIPLET_CXXABI=${triplet} distclean-${proj}
+		    make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${cxx} BB_TRIPLET_CXXABI=${triplet} install-${proj}
+        done
+    done
 done

deps/tools/bb-install.mk

@@ -8,7 +8,7 @@
 # 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 := $(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_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)))))
 
 define bb-install