[Libclc-dev] [PATCH 1/2] travis: Use gcc-6 for llvm-7 build

Jan Vesely via Libclc-dev libclc-dev at lists.llvm.org
Mon Jan 14 13:54:47 PST 2019


llvm does not expose -std=c++11 in cxx flags.
gcc-6 switched default from c++98 to c++14
Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
---
 .travis.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index abdcf58..d4798fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,8 +78,7 @@ matrix:
         - LLVM_VERSION=7
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
         - CHECK_FILES="barts-r600--.bc cayman-r600--.bc cedar-r600--.bc cypress-r600--.bc tahiti-amdgcn--.bc amdgcn--amdhsa.bc tahiti-amdgcn-mesa-mesa3d.bc nvptx--nvidiacl.bc nvptx64--nvidiacl.bc"
-        # llvm passes -Werror=date-time which is only supported in gcc-4.9+
-        - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
+        - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
       addons:
         apt:
           sources:
@@ -88,8 +87,7 @@ matrix:
             - ubuntu-toolchain-r-test
           packages:
             - libedit-dev
-            # LLVM-7 needs libstdc++4.9
-            - g++-4.9
+            - g++-6
             # From sources above
             - llvm-7-dev
             - clang-7
@@ -162,8 +160,7 @@ matrix:
         - LLVM_VERSION=7
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
         - CHECK_FILES="barts-r600--.bc cayman-r600--.bc cedar-r600--.bc cypress-r600--.bc tahiti-amdgcn--.bc amdgcn--amdhsa.bc tahiti-amdgcn-mesa-mesa3d.bc nvptx--nvidiacl.bc nvptx64--nvidiacl.bc"
-        # llvm passes -Werror=date-time which is only supported in gcc-4.9+
-        - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
+        - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
       addons:
         apt:
           sources:
@@ -172,8 +169,7 @@ matrix:
             - ubuntu-toolchain-r-test
           packages:
             - libedit-dev
-            # LLVM-7 needs libstdc++4.9
-            - g++-4.9
+            - g++-6
             # From sources above
             - llvm-7-dev
             - clang-7
-- 
2.19.2



More information about the Libclc-dev mailing list