summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-08-30 01:58:47 (GMT)
committerGennadiy Civil <misterg@google.com>2018-08-30 01:58:47 (GMT)
commitfab22526469a1a87ca248e54fe371cbfbf009cd4 (patch)
tree3b867a1d81e818f53f5944348ee6230c47d75071
parent3d5612182581df64acc12d2633e473decf5adc47 (diff)
downloadgoogletest-fab22526469a1a87ca248e54fe371cbfbf009cd4.zip
googletest-fab22526469a1a87ca248e54fe371cbfbf009cd4.tar.gz
googletest-fab22526469a1a87ca248e54fe371cbfbf009cd4.tar.bz2
Changing clang tp 3.9 as 3.7 no longer works on Travis
-rwxr-xr-xci/env-linux.sh2
-rwxr-xr-xci/env-osx.sh2
-rwxr-xr-xci/install-linux.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/ci/env-linux.sh b/ci/env-linux.sh
index 9086b1f..37800d6 100755
--- a/ci/env-linux.sh
+++ b/ci/env-linux.sh
@@ -37,5 +37,5 @@
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+ if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
fi
diff --git a/ci/env-osx.sh b/ci/env-osx.sh
index 31c8835..127a969 100755
--- a/ci/env-osx.sh
+++ b/ci/env-osx.sh
@@ -36,5 +36,5 @@
# TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}.
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+ if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
fi
diff --git a/ci/install-linux.sh b/ci/install-linux.sh
index 02a1943..05e2cb2 100755
--- a/ci/install-linux.sh
+++ b/ci/install-linux.sh
@@ -41,7 +41,7 @@ if [ "${TRAVIS_SUDO}" = "true" ]; then
echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | \
sudo tee /etc/apt/sources.list.d/bazel.list
curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
- sudo apt-get update && sudo apt-get install -y bazel gcc-4.9 g++-4.9 clang-3.7
+ sudo apt-get update && sudo apt-get install -y bazel gcc-4.9 g++-4.9 clang-3.9
elif [ "${CXX}" = "clang++" ]; then
# Use ccache, assuming $HOME/bin is in the path, which is true in the Travis build environment.
ln -sf /usr/bin/ccache $HOME/bin/${CXX};