aboutsummaryrefslogtreecommitdiff
path: root/travis.sh
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2015-12-18 15:16:07 -0800
committerFeng Xiao <xfxyjwf@gmail.com>2015-12-21 00:28:37 -0800
commit1e2fece3e01b8e079b4f6930306377a9332a2ddb (patch)
treec6696e6c8c609cf71b71a2d6b5f64017e75b2c26 /travis.sh
parenta0cecfd31a091ba6b95f4dfffe191c0aa033a54f (diff)
downloadprotobuf-1e2fece3e01b8e079b4f6930306377a9332a2ddb.tar.gz
protobuf-1e2fece3e01b8e079b4f6930306377a9332a2ddb.tar.bz2
protobuf-1e2fece3e01b8e079b4f6930306377a9332a2ddb.zip
Configure conformance tests to build with C++11 (require GCC 4.8)
[skip ci]
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/travis.sh b/travis.sh
index e7667fbc..317bef4e 100755
--- a/travis.sh
+++ b/travis.sh
@@ -11,6 +11,13 @@
# For when some other test needs the C++ main build, including protoc and
# libprotobuf.
internal_build_cpp() {
+ # Install GCC 4.8 to replace the default GCC 4.6. We need 4.8 for more
+ # decent C++ 11 support in order to compile conformance tests.
+ sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+ sudo apt-get update -qq
+ sudo apt-get install -qq g++-4.8
+ export CXX="g++-4.8" CC="gcc-4.8"
+
./autogen.sh
./configure
make -j2