OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

travis: avoid using unset llvm-config

Browse Source 
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>
This commit is contained in:
Eric Engestrom
2019-01-02 12:28:48 +00:00
parent c8ae891035
commit e12b0b5c6d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@@ -823,12 +823,16 @@ script:
- | - |
if test "x$BUILD" = xmeson; then if test "x$BUILD" = xmeson; then
# We need to control the version of llvm-config we're using, so we'll if test -n "$LLVM_CONFIG"; then
# generate a native file to do so. This requires meson >=0.49 # 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 #
echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file
$LLVM_CONFIG --version $LLVM_CONFIG --version
else
: > native.file
fi
export CFLAGS="$CFLAGS -isystem`pwd`" export CFLAGS="$CFLAGS -isystem`pwd`"
meson _build \ meson _build \