diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2019-01-02 12:28:48 +0000 |
|---|---|---|
| committer | Eric Engestrom <eric.engestrom@intel.com> | 2019-01-11 14:38:35 +0000 |
| commit | e12b0b5c6d0e957388b3f902d064e800decfa603 (patch) | |
| tree | 234723a15282d775f6e5d853bac93e0f2a88fcd3 /.travis.yml | |
| parent | c8ae891035d12d35496a06afb94ebfdf0e72505a (diff) | |
travis: avoid using unset llvm-config
Fixes the following errors:
usage: which [-as] program ...
/Users/travis/.travis/job_stages: line 110: --version: command not found
... caused by the use of an undefined $LLVM_CONFIG
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index b70df99d67e..7279f3ad9cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -823,12 +823,16 @@ script: - | if test "x$BUILD" = xmeson; then - # We need to control the version of llvm-config we're using, so we'll - # generate a native file to do so. This requires meson >=0.49 - # - echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file - - $LLVM_CONFIG --version + if test -n "$LLVM_CONFIG"; then + # We need to control the version of llvm-config we're using, so we'll + # generate a native file to do so. This requires meson >=0.49 + # + echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file + + $LLVM_CONFIG --version + else + : > native.file + fi export CFLAGS="$CFLAGS -isystem`pwd`" meson _build \ |