diff options
| author | Jan Vesely <jan.vesely@rutgers.edu> | 2019-03-13 06:58:51 +0000 |
|---|---|---|
| committer | Jan Vesely <jan.vesely@rutgers.edu> | 2019-03-13 06:58:51 +0000 |
| commit | edcf4d28b3b281622c62d138d22c8fd3a0e50b4d (patch) | |
| tree | 7f01b6ab4ccfb627082494dddeb45318465a7421 /libclc | |
| parent | d02c9f59ff62a85587f4d8e65fbf5ba5047ae5dd (diff) | |
| download | llvm-edcf4d28b3b281622c62d138d22c8fd3a0e50b4d.tar.gz | |
travis: Use gcc-6 for llvm-7 build
llvm does not expose -std=c++11 in cxx flags.
gcc-6 switched default from c++98 to c++14
Reviewers: Aaron Watry, Tom Stellard
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
llvm-svn: 356009
Diffstat (limited to 'libclc')
| -rw-r--r-- | libclc/.travis.yml | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libclc/.travis.yml b/libclc/.travis.yml index abdcf589b994..d4798fa70c3a 100644 --- a/libclc/.travis.yml +++ b/libclc/.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 |