Skip to content

Commit cc1a43a

Browse files
committed
handle CXX expanded BB builds
1 parent e98f99c commit cc1a43a

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

contrib/refresh_bb_tarballs.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ TRIPLETS="i686-linux-gnu x86_64-linux-gnu aarch64-linux-gnu arm-linux-gnueabihf
1313

1414
# These are the projects currently using BinaryBuilder; both GCC-expanded and non-GCC-expanded:
1515
BB_PROJECTS="gmp mbedtls libssh2 mpfr curl libgit2 pcre libuv unwind osxunwind dsfmt objconv p7zip zlib suitesparse openlibm"
16-
BB_GCC_EXPANDED_PROJECTS="llvm openblas"
16+
BB_GCC_EXPANDED_PROJECTS="openblas"
17+
BB_CXX_EXPANDED_PROJECTS="llvm"
1718

1819
# If we've been given a project name, filter down to that one:
1920
if [ -n "${1}" ]; then
@@ -25,6 +26,10 @@ if [ -n "${1}" ]; then
2526
*${1}*) BB_GCC_EXPANDED_PROJECTS="${1}" ;;
2627
*) BB_GCC_EXPANDED_PROJECTS="" ;;
2728
esac
29+
case "${BB_CXX_EXPANDED_PROJECTS}" in
30+
*${1}*) BB_CXX_EXPANDED_PROJECTS="${1}" ;;
31+
*) BB_CXX_EXPANDED_PROJECTS="" ;;
32+
esac
2833
fi
2934

3035
# Get "contrib/" directory path
@@ -45,4 +50,12 @@ for triplet in ${TRIPLETS}; do
4550
make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${libgfortran} BB_TRIPLET_CXXABI=${triplet} install-${proj}
4651
done
4752
done
53+
54+
for proj in ${BB_CXX_EXPANDED_PROJECTS}; do
55+
PROJ="$(echo ${proj} | tr [a-z] [A-Z])"
56+
for cxx in cxx03 cxx11; do
57+
make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${cxx} BB_TRIPLET_CXXABI=${triplet} distclean-${proj}
58+
make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${cxx} BB_TRIPLET_CXXABI=${triplet} install-${proj}
59+
done
60+
done
4861
done

0 commit comments

Comments
 (0)