maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

travis: Deduplicate LLVM_CONFIG variable 

Reviewers: Aaron Watry, Tom Stellard
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
llvm-svn: 356010
This commit is contained in:
Jan Vesely 2019-03-13 06:58:53 +00:00
parent edcf4d28b3
commit 09ebdc03fe
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libclc/.travis.yml
View File

@ -12,7 +12,6 @@ matrix:
- env:
- LABEL="make gcc LLVM-3.9"
- LLVM_VERSION=3.9
- 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 nvptx--nvidiacl.bc nvptx64--nvidiacl.bc"
addons:
apt:
@ -27,7 +26,6 @@ matrix:
- env:
- LABEL="make gcc LLVM-4.0"
- LLVM_VERSION=4.0
- 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"
addons:
apt:
@ -42,7 +40,6 @@ matrix:
- env:
- LABEL="make gcc LLVM-5.0"
- LLVM_VERSION=5.0
- 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"
addons:
apt:
@ -57,7 +54,6 @@ matrix:
- env:
- LABEL="make gcc LLVM-6.0"
- LLVM_VERSION=6.0
- 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"
@ -76,7 +72,6 @@ matrix:
- env:
- LABEL="make gcc LLVM-7"
- 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"
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
addons:
@ -94,7 +89,6 @@ matrix:
- env:
- LABEL="cmake gcc LLVM-3.9"
- LLVM_VERSION=3.9
- 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 nvptx--nvidiacl.bc nvptx64--nvidiacl.bc"
addons:
apt:
@ -109,7 +103,6 @@ matrix:
- env:
- LABEL="cmake gcc LLVM-4.0"
- LLVM_VERSION=4.0
- 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"
addons:
apt:
@ -124,7 +117,6 @@ matrix:
- env:
- LABEL="cmake gcc LLVM-5.0"
- LLVM_VERSION=5.0
- 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"
addons:
apt:
@ -139,7 +131,6 @@ matrix:
- env:
- LABEL="cmake gcc LLVM-6.0"
- LLVM_VERSION=6.0
- 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"
@ -158,7 +149,6 @@ matrix:
- env:
- LABEL="cmake gcc LLVM-7"
- 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"
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
addons:
@ -176,6 +166,7 @@ matrix:
before_install:
- eval "${MATRIX_EVAL}"
- export LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
script:
- if $(echo $LABEL | grep cmake > /dev/null) ; then