@@ -33,7 +33,7 @@ matrix:
3333 include :
3434 - os : linux
3535 dist : xenial # Ubuntu 16.04 w/ llvm8
36- env : LLVM_VER=8 BUILD_TYPE=Release
36+ env : LLVM_VER=8 BUILD_TYPE=Release COMPILER=gcc
3737 before_install :
3838 - git clone -b ocl-open-80 https://github.com/intel/opencl-clang opencl-clang
3939 addons :
@@ -45,7 +45,7 @@ matrix:
4545 install : *v8install
4646 - os : linux
4747 dist : bionic # Ubuntu 18.04 w/ llvm8
48- env : LLVM_VER=8 BUILD_TYPE=Release
48+ env : LLVM_VER=8 BUILD_TYPE=Release COMPILER=gcc
4949 before_install :
5050 - git clone -b ocl-open-80 https://github.com/intel/opencl-clang opencl-clang
5151 addons :
@@ -57,7 +57,7 @@ matrix:
5757 install : *v8install
5858 - os : linux
5959 dist : xenial # Ubuntu 16.04 w/ llvm9
60- env : LLVM_VER=9 BUILD_TYPE=Release
60+ env : LLVM_VER=9 BUILD_TYPE=Release COMPILER=gcc
6161 before_install :
6262 - git clone -b ocl-open-90 https://github.com/intel/opencl-clang opencl-clang
6363 addons :
@@ -69,7 +69,7 @@ matrix:
6969 install : *v9install
7070 - os : linux
7171 dist : bionic # Ubuntu 18.04 w/ llvm9
72- env : LLVM_VER=9 BUILD_TYPE=Release
72+ env : LLVM_VER=9 BUILD_TYPE=Release COMPILER=gcc
7373 before_install :
7474 - git clone -b ocl-open-90 https://github.com/intel/opencl-clang opencl-clang
7575 addons :
@@ -79,16 +79,61 @@ matrix:
7979 key_url : ' https://apt.llvm.org/llvm-snapshot.gpg.key'
8080 packages : *v9
8181 install : *v9install
82-
82+ - os : linux
83+ dist : xenial # Ubuntu 16.04 w/ llvm8
84+ env : LLVM_VER=8 BUILD_TYPE=Release COMPILER=clang
85+ before_install :
86+ - git clone -b ocl-open-80 https://github.com/intel/opencl-clang opencl-clang
87+ addons :
88+ apt :
89+ sources :
90+ - sourceline : ' deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main'
91+ key_url : ' https://apt.llvm.org/llvm-snapshot.gpg.key'
92+ packages : *v8
93+ install : *v8install
94+ - os : linux
95+ dist : bionic # Ubuntu 18.04 w/ llvm8
96+ env : LLVM_VER=8 BUILD_TYPE=Release COMPILER=clang
97+ before_install :
98+ - git clone -b ocl-open-80 https://github.com/intel/opencl-clang opencl-clang
99+ addons :
100+ apt :
101+ sources :
102+ - sourceline : ' deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main'
103+ key_url : ' https://apt.llvm.org/llvm-snapshot.gpg.key'
104+ packages : *v8
105+ install : *v8install
106+ - os : linux
107+ dist : xenial # Ubuntu 16.04 w/ llvm9
108+ env : LLVM_VER=9 BUILD_TYPE=Release COMPILER=clang
109+ before_install :
110+ - git clone -b ocl-open-90 https://github.com/intel/opencl-clang opencl-clang
111+ addons :
112+ apt :
113+ sources :
114+ - sourceline : ' deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
115+ key_url : ' https://apt.llvm.org/llvm-snapshot.gpg.key'
116+ packages : *v9
117+ install : *v9install
118+ - os : linux
119+ dist : bionic # Ubuntu 18.04 w/ llvm9
120+ env : LLVM_VER=9 BUILD_TYPE=Release COMPILER=clang
121+ before_install :
122+ - git clone -b ocl-open-90 https://github.com/intel/opencl-clang opencl-clang
123+ addons :
124+ apt :
125+ sources :
126+ - sourceline : ' deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
127+ key_url : ' https://apt.llvm.org/llvm-snapshot.gpg.key'
128+ packages : *v9
129+ install : *v9install
130+
83131git :
84132 depth : 1
85133
86134branches :
87135 only :
88136 - master
89-
90- compiler :
91- - gcc
92137
93138script :
94139 - if [ "${LLVM_VER}" == "9" ]; then sudo touch /usr/lib/llvm-9/bin/lit-cpuid; fi # Cmake fix
@@ -98,4 +143,4 @@ script:
98143 - cd ../..
99144 - mkdir build && cd build
100145 - cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_FIND_DEBUG_MODE=ON -DIGC_PREFERRED_LLVM_VERSION=${LLVM_VER} -DCCLANG_FROM_SYSTEM=TRUE ../IGC
101- - make -j`nproc`
146+ - make -j`nproc`
0 commit comments