diff options
| author | Eric Anholt <[email protected]> | 2019-07-23 11:12:07 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2019-07-25 08:56:19 -0700 |
| commit | f68b98738750e5a526fd801824592b70cc6d8ce5 (patch) | |
| tree | 90daa909dae082fc06a0918a7dbba5e7e7b99d0e | |
| parent | 494ecef6b42198ab6c3eaa8b3e5222643e1e44ff (diff) | |
gitlab-ci: Always set libdir to lib/
I introduced libdir for cross-builds so we could point at the
resulting drivers without per-arch dependencies, but I'd rather not
have to type x86_64-linux-whatever for non-cross-builds either.
Reviewed-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rwxr-xr-x | .gitlab-ci/meson-build.sh | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5ae08ce777..a43e69c00e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -247,7 +247,6 @@ meson-vulkan: -D gallium-nine=false -D llvm=false CROSS: > - --libdir lib --cross /tmp/cross_file.txt script: diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh index 2bf51de1cd6..04b0189e254 100755 --- a/.gitlab-ci/meson-build.sh +++ b/.gitlab-ci/meson-build.sh @@ -17,6 +17,7 @@ fi rm -rf _build meson _build --native-file=native.file \ ${CROSS} \ + -D libdir=lib \ -D buildtype=debug \ -D build-tests=true \ -D libunwind=${UNWIND} \ |