diff options
| author | Ben Clayton <bclayton@google.com> | 2020-01-17 18:20:58 +0000 |
|---|---|---|
| committer | dan sinclair <dsinclair@google.com> | 2020-01-17 13:20:57 -0500 |
| commit | 9221e1f7f337bffa87c972dcd16b17f083ae5665 (patch) | |
| tree | bbdb15e6337c81f8acfcd3ec61504384551ee94c /kokoro | |
| parent | 42eda81eba7e6ca9d0ddd500931eeb53e6c495c5 (diff) | |
| download | amber-9221e1f7f337bffa87c972dcd16b17f083ae5665.tar.gz | |
Roll SwiftShader forward (#768)
Repoint SwiftShader to 2cb1db08.
Update CMake build flags after a renaming spree.
SwiftShader has also moved to C++14, so set `CMAKE_CXX_STANDARD` to 14
when `AMBER_ENABLE_SWIFTSHADER` is enabled. Also use GCC 7, which can
correctly compile C++14.
Fixes: #763
Diffstat (limited to 'kokoro')
| -rw-r--r-- | kokoro/scripts/linux/build.sh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kokoro/scripts/linux/build.sh b/kokoro/scripts/linux/build.sh index a221b79..664ea9e 100644 --- a/kokoro/scripts/linux/build.sh +++ b/kokoro/scripts/linux/build.sh @@ -31,8 +31,13 @@ if [ $COMPILER = "clang" ] then CMAKE_C_CXX_COMPILER="-DCMAKE_C_COMPILER=/usr/bin/clang-5.0 -DCMAKE_CXX_COMPILER=/usr/bin/clang++-5.0" else - # Use newer gcc than default. - CMAKE_C_CXX_COMPILER="-DCMAKE_C_COMPILER=/usr/bin/gcc-5 -DCMAKE_CXX_COMPILER=/usr/bin/g++-5" + # Specify we want to build with GCC 7 (which supports C++14) + sudo add-apt-repository ppa:ubuntu-toolchain-r/test + sudo apt-get update + sudo apt-get install -y gcc-7 g++-7 + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 100 --slave /usr/bin/g++ g++ /usr/bin/g++-7 + sudo update-alternatives --set gcc "/usr/bin/gcc-7" + CMAKE_C_CXX_COMPILER="-DCMAKE_C_COMPILER=/usr/bin/gcc-7 -DCMAKE_CXX_COMPILER=/usr/bin/g++-7" fi # Possible configurations are: |