Skip to content

Commit 0c6a0e2

Browse files
committed
Use prebuilt llvm but build spirv translator from source
1 parent f5382a0 commit 0c6a0e2

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

.travis.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ dist: xenial
88

99
git:
1010
depth: 1
11-
quiet: true
1211

1312
branches:
1413
only:
@@ -21,20 +20,28 @@ env:
2120
- BUILD_TYPE=Release
2221
- BUILD_TYPE=Debug
2322

23+
addons:
24+
apt:
25+
sources:
26+
- sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main'
27+
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
28+
- ubuntu-toolchain-r-test
29+
packages:
30+
- llvm-8-tools
31+
- llvm-8-dev
32+
- libclang-8-dev
2433

2534
install:
26-
- git clone https://github.com/llvm-mirror/llvm.git -b release_80
27-
- cd ./llvm/tools
28-
- git clone https://github.com/llvm-mirror/clang.git -b release_80
29-
- cd ../projects
30-
- git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git -b llvm_release_80 llvm-spirv
31-
- git clone https://github.com/intel/opencl-clang.git -b ocl-open-80
32-
- cd ../..
35+
- git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator.git -b llvm_release_80 spirv-llvm-translator
36+
- mkdir spirv-llvm-translator/build && cd spirv-llvm-translator/build
37+
- cmake .. -DCMAKE_INSTALL_PREFIX=./install && make -j`nproc` && make install
38+
- cd ../../
3339

3440
compiler:
3541
- gcc
42+
- clang
3643

3744
script:
3845
- mkdir build && cd build
39-
- cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DLLVM_NO_DEAD_STRIP=ON --DCMAKE_INSTALL_PREFIX=./install ../llvm
46+
- cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DLLVM_NO_DEAD_STRIP=ON -DLLVMSPIRV_INCLUDED_IN_LLVM=OFF -DSPIRV_TRANSLATOR_DIR=../spirv-llvm-translator -DSPIRV_SOURCE_DIR=../spirv-llvm-translator/build/install ../
4047
- make -j`nproc`

0 commit comments

Comments
 (0)