diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2021-01-28 08:27:06 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-02-08 14:19:06 +0000 |
| commit | a4cb96d12b38c663533f135ae4259d8bd56f6a75 (patch) | |
| tree | 9c093fa9559d2219de4a25e0a6a8a551309ae719 /.gitlab-ci | |
| parent | 4f4bb72745ca1fa507749843d32f320f879cf1b7 (diff) | |
ci: Fix selection of linker in Android builds
Otherwise, Clang will error out when it doesn't link:
Compiler stderr:
clang: error: argument unused during compilation: '-fuse-ld=lld' [-Werror,-Wunused-command-line-argument]
When that happens when Meson is checking for the presence of macros in
sys/sysmacros.h, that file won't be included resulting in the following
errors:
ld.lld: error: undefined symbol: makedev
ld.lld: error: undefined symbol: major
ld.lld: error: undefined symbol: minor
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Acked-by: Eric Anholt <eric@anholt.net>
Gitlab: #4137
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8757>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/create-android-cross-file.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab-ci/create-android-cross-file.sh b/.gitlab-ci/create-android-cross-file.sh index 4590ce172a9..99ad5b98b46 100644 --- a/.gitlab-ci/create-android-cross-file.sh +++ b/.gitlab-ci/create-android-cross-file.sh @@ -16,8 +16,10 @@ arch2=${5:-$2} cat >$cross_file <<EOF [binaries] ar = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/$arch-ar' -c = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}29-clang', '-fuse-ld=lld', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables'] -cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}29-clang++', '-fuse-ld=lld', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++'] +c = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}29-clang', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables'] +cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}29-clang++', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-static-libstdc++'] +c_ld = 'lld' +cpp_ld = 'lld' strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/$arch-strip' pkgconfig = ['/usr/bin/pkg-config'] |