diff options
-rw-r--r-- | .gitlab-ci.yml | 10 | ||||
-rw-r--r-- | .gitlab-ci/Dockerfile.ubuntu | 2 | ||||
-rw-r--r-- | .travis.yml | 22 |
3 files changed, 12 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db17a6cccc5..e9d0a1c2809 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -116,6 +116,9 @@ containers:ubuntu: variables: SCONSFLAGS: "-j4" script: + - if test -n "$LLVM_VERSION"; then + export LLVM_CONFIG="llvm-config-${LLVM_VERSION}"; + fi - scons $SCONS_TARGET - eval $SCONS_CHECK_COMMAND @@ -171,3 +174,10 @@ build:scons-nollvm: variables: SCONS_TARGET: "llvm=0" SCONS_CHECK_COMMAND: "scons llvm=0 check" + +build:scons-llvm: + extends: .scons-build + variables: + SCONS_TARGET: "llvm=1" + SCONS_CHECK_COMMAND: "scons llvm=1 check" + LLVM_VERSION: "3.9" diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu index 7f1d23be4a9..8131eeaf0d2 100644 --- a/.gitlab-ci/Dockerfile.ubuntu +++ b/.gitlab-ci/Dockerfile.ubuntu @@ -20,6 +20,8 @@ RUN apt-get install -y \ libxshmfence-dev \ libvdpau-dev \ libva-dev \ + llvm-3.9-dev \ + libclang-3.9-dev \ llvm-7-dev \ xz-utils \ libexpat1-dev \ diff --git a/.travis.yml b/.travis.yml index 50bb0333001..56b920f1315 100644 --- a/.travis.yml +++ b/.travis.yml @@ -531,28 +531,6 @@ matrix: - python3-pip - python3-setuptools - env: - - LABEL="scons LLVM" - - BUILD=scons - - SCONSFLAGS="-j4" - - SCONS_TARGET="llvm=1" - # Keep it symmetrical to the make build. - - SCONS_CHECK_COMMAND="scons llvm=1 check" - - LLVM_VERSION=3.5 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - addons: - apt: - packages: - # LLVM packaging is broken and misses these dependencies - - libedit-dev - # We actually want to test against llvm-3.3, yet 3.5 is available - - llvm-3.5-dev - # Common - - xz-utils - - x11proto-xf86vidmode-dev - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - env: - LABEL="scons SWR" - BUILD=scons - SCONSFLAGS="-j4" |