diff options
| author | Andres Gomez <[email protected]> | 2018-02-28 23:18:59 +0200 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-03-20 16:57:26 +0000 |
| commit | 9f86aee1d16d3c1eb296a8549587d98285991553 (patch) | |
| tree | 89a417b78c04a45e899b9f2f9093cdc655aed080 /.travis.yml | |
| parent | 282591dd00775c39eb21754cec8dd95fc7960319 (diff) | |
travis: make Meson find the proper llvm-config
Travis CI has moved to LLVM 5.0, and meson is detecting automatically
the available version in /usr/local/bin based on the PATH env variable
order preference.
As for 0.44.x, Meson cannot receive the path to the llvm-config binary
as a configuration parameter. See
https://github.com/mesonbuild/meson/issues/2887 and
https://github.com/dcbaker/meson/commit/7c8b6ee3fa42f43c9ac7dcacc61a77eca3f1bcef
We want to use the custom (APT) installed version. Therefore, let's
make Meson find our wanted version sooner than the one at
/usr/local/bin
Once this is corrected, we would still need a patch similar to:
https://lists.freedesktop.org/archives/mesa-dev/2017-December/180217.html
v2: Create the link only to the specificly wanted LLVM version (Gert).
Cc: Eric Engestrom <[email protected]>
Cc: Dylan Baker <[email protected]>
Cc: Emil Velikov <[email protected]>
Cc: Juan A. Suarez Romero <[email protected]>
Cc: Gert Wollny <[email protected]>
Cc: Jon Turney <[email protected]>
Signed-off-by: Andres Gomez <[email protected]>
Reviewed-and-Tested-by: Eric Engestrom <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
Reviewed-by: Juan A. Suarez <[email protected]>
Reviewed-By: Gert Wollny <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
(cherry picked from commit b5b912dfeebabafbaff176fe4205eb74607f709b)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 50942083774..7594887dfc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,8 @@ matrix: - LABEL="meson Vulkan" - BUILD=meson - MESON_OPTIONS="-Ddri-drivers= -Dgallium-drivers=" + - LLVM_VERSION=4.0 + - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" addons: apt: sources: @@ -545,8 +547,28 @@ script: scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND; fi - - if test "x$BUILD" = xmeson; then - export CFLAGS="$CFLAGS -isystem`pwd`"; - meson _build $MESON_OPTIONS; - ninja -C _build; + - | + if test "x$BUILD" = xmeson; then + + # Travis CI has moved to LLVM 5.0, and meson is detecting + # automatically the available version in /usr/local/bin based on + # the PATH env variable order preference. + # + # As for 0.44.x, Meson cannot receive the path to the + # llvm-config binary as a configuration parameter. See + # https://github.com/mesonbuild/meson/issues/2887 and + # https://github.com/dcbaker/meson/commit/7c8b6ee3fa42f43c9ac7dcacc61a77eca3f1bcef + # + # We want to use the custom (APT) installed version. Therefore, + # let's make Meson find our wanted version sooner than the one + # at /usr/local/bin + # + # Once this is corrected, we would still need a patch similar + # to: + # https://lists.freedesktop.org/archives/mesa-dev/2017-December/180217.html + test -f /usr/bin/$LLVM_CONFIG && ln -s /usr/bin/$LLVM_CONFIG $HOME/prefix/bin/llvm-config + + export CFLAGS="$CFLAGS -isystem`pwd`" + meson _build $MESON_OPTIONS + ninja -C _build fi |