diff options
| author | Marco Poletti <poletti.marco@gmail.com> | 2019-12-22 16:28:44 -0800 |
|---|---|---|
| committer | Marco Poletti <poletti.marco@gmail.com> | 2019-12-22 16:28:44 -0800 |
| commit | ceea9f7d1ceb831de2a0d164e39ada437f92f852 (patch) | |
| tree | 10f0bb3dee3d3570f794af406260ec50bef1f8a7 /extras | |
| parent | e411f050accead5e855c74d1baac8c7f150715e3 (diff) | |
| download | google-fruit-ceea9f7d1ceb831de2a0d164e39ada437f92f852.tar.gz | |
More changes to try getting OS X CI tests to work again.
Diffstat (limited to 'extras')
| -rwxr-xr-x | extras/scripts/postsubmit-helper.sh | 2 | ||||
| -rwxr-xr-x | extras/scripts/travis_ci_install_osx.sh | 22 |
2 files changed, 17 insertions, 7 deletions
diff --git a/extras/scripts/postsubmit-helper.sh b/extras/scripts/postsubmit-helper.sh index 7a53da3..cc96928 100755 --- a/extras/scripts/postsubmit-helper.sh +++ b/extras/scripts/postsubmit-helper.sh @@ -107,7 +107,7 @@ run_make() { if [[ "${COMPILER}" != "bazel" ]] then # This is only needed in OS X but it has no effect on Linux so we can add it unconditionally. - BOOST_INCLUDE_FLAG="-I /usr/local/include/boost" + BOOST_INCLUDE_FLAG="-I /usr/local/include/boost -I /usr/local/include" COMMON_CXX_FLAGS="$STLARG $BOOST_INCLUDE_FLAG -Werror -pedantic -Winvalid-pch" echo CXX version: $($CXX --version) diff --git a/extras/scripts/travis_ci_install_osx.sh b/extras/scripts/travis_ci_install_osx.sh index 7946842..40a91fd 100755 --- a/extras/scripts/travis_ci_install_osx.sh +++ b/extras/scripts/travis_ci_install_osx.sh @@ -26,12 +26,22 @@ gcc-7) install_brew_package gcc@7 ;; gcc-8) install_brew_package gcc@8 ;; gcc-9) install_brew_package gcc@9 ;; clang-default) ;; -clang-3.9) install_brew_package llvm@3.9 ;; -clang-4.0) install_brew_package llvm@4 ;; -clang-5.0) install_brew_package llvm@5 ;; -clang-6.0) install_brew_package llvm@6 ;; -clang-7.0) install_brew_package llvm@7 ;; -clang-8.0) install_brew_package llvm@8 ;; +clang-6.0) + install_brew_package llvm@6 + ln -s /usr/local/opt/llvm@6/bin/clang++ /usr/local/bin/clang++-6 + ;; +clang-7.0) + install_brew_package llvm@7 + ln -s /usr/local/opt/llvm@7/bin/clang++ /usr/local/bin/clang++-7 + ;; +clang-8.0) + install_brew_package llvm@8 + ln -s /usr/local/opt/llvm@8/bin/clang++ /usr/local/bin/clang++-8 + ;; +clang-9.0) + install_brew_package llvm@9 + ln -s /usr/local/opt/llvm@9/bin/clang++ /usr/local/bin/clang++-9 + ;; *) echo "Compiler not supported: ${COMPILER}. See travis_ci_install_osx.sh"; exit 1 ;; esac |