Googletest export

Fix the TravisCI build by updating the required tools

PiperOrigin-RevId: 344882646
This commit is contained in:
dmauro
2020-11-30 16:55:34 -05:00
committed by vslashg
parent 1544828d27
commit d737069111
4 changed files with 13 additions and 24 deletions

View File

@@ -33,15 +33,9 @@
# This file should be sourced, and not executed as a standalone script.
#
# TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}.
#
if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
if [ "$CXX" = "clang++" ]; then
# $PATH needs to be adjusted because the llvm tap doesn't install the
# package to /usr/local/bin, etc, like the gcc tap does.
# See: https://github.com/Homebrew/legacy-homebrew/issues/29733
clang_version=3.9
export PATH="/usr/local/opt/llvm@${clang_version}/bin:$PATH";
fi
if [ "${TRAVIS_OS_NAME}" != "osx" ]; then
echo "Not a macOS build; skipping"
exit 0
fi
# This file is currently intentionally empty.

View File

@@ -36,5 +36,4 @@ if [ "${TRAVIS_OS_NAME}" != "osx" ]; then
exit 0
fi
brew update
brew install ccache gcc@4.9
# This file is currently intentionally empty.

View File

@@ -31,10 +31,6 @@
set -e
# ccache on OS X needs installation first
# reset ccache statistics
ccache --zero-stats
echo PATH=${PATH}
echo "Compiler configuration:"