b016f218fb
When cross-building for Android meson fails to find supported compiler arguments for the C++ cross-compiler, e.g.: ``` Compiler for C++ supports arguments -Wno-array-bounds: NO (cached) Compiler for C++ supports arguments -Wno-overflow: NO Compiler for C++ supports arguments -Wno-c++11-narrowing: NO (cached) Compiler for C++ supports arguments -Wno-vla-cxx-extension: NO (cached) ``` This is due to an **unrelated** and more generic compilation failure when testing for the supported arguments, e.g.: ``` Command line: `/tmp/android-ndk-r27c/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android34-clang++ -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -static-libstdc++ /home/ao2/Collabora/GOO0042/mesa/_build/meson-private/tmpv6_hke9l/testfile.cpp -o /home/ao2/Collabora/GOO0042/mesa/_build/meson-private/tmpv6_hke9l/output.obj -c -Wno-error=c99-designator -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=self-assign -D_FILE_OFFSET_BITS=64 -O0 -fpermissive -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wvla-cxx-extension -Wno-vla-cxx-extension` -> 1 stderr: clang++: error: argument unused during compilation: '-static-libstdc++' [-Werror,-Wunused-command-line-argument] ----------- Compiler for C++ supports arguments -Wno-vla-cxx-extension: NO ``` The issue is caused by how the cross compiler is set up by .gitlab-ci/container/create-android-cross-file.sh Allow the cross compiler to still start even when the `-Werror,-Wunused-command-line-argument` error occurs in order to be able to actually detect other arguments: ``` Command line: `/tmp/android-ndk-r27c/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android34-clang++ -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables --start-no-unused-arguments -static-libstdc++ --end-no-unused-arguments /home/ao2/Collabora/GOO0042/mesa/_build/meson-private/tmpm6eolxed/testfile.cpp -o /home/ao2/Collabora/GOO0042/mesa/_build/meson-private/tmpm6eolxed/output.obj -c -Wno-error=c99-designator -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=self-assign -D_FILE_OFFSET_BITS=64 -O0 -fpermissive -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -Wvla-cxx-extension -Wno-vla-cxx-extension` -> 0 Compiler for C++ supports arguments -Wno-vla-cxx-extension: YES ``` This makes argument detection work again, e.g: ``` Compiler for C++ supports arguments -Wno-array-bounds: YES (cached) Compiler for C++ supports arguments -Wno-overflow: YES Compiler for C++ supports arguments -Wno-c++11-narrowing: YES (cached) Compiler for C++ supports arguments -Wno-vla-cxx-extension: YES (cached) ``` Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12441 Reviewed-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Valentine Burley <valentine.burley@collabora.com> Reviewed-by: Rob Clark <robclark@freedesktop.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33013>
38 lines
1.3 KiB
Bash
38 lines
1.3 KiB
Bash
#!/bin/bash
|
|
|
|
ndk=$1
|
|
arch=$2
|
|
cpu_family=$3
|
|
cpu=$4
|
|
cross_file="/cross_file-$arch.txt"
|
|
sdk_version=$5
|
|
|
|
# armv7 has the toolchain split between two names.
|
|
arch2=${6:-$2}
|
|
|
|
# Note that we disable C++ exceptions, because Mesa doesn't use exceptions,
|
|
# and allowing it in code generation means we get unwind symbols that break
|
|
# the libEGL and driver symbol tests.
|
|
|
|
cat > "$cross_file" <<EOF
|
|
[binaries]
|
|
ar = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar'
|
|
c = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_version}-clang', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables']
|
|
cpp = ['ccache', '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/${arch2}${sdk_version}-clang++', '-fno-exceptions', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '--start-no-unused-arguments', '-static-libstdc++', '--end-no-unused-arguments']
|
|
c_ld = 'lld'
|
|
cpp_ld = 'lld'
|
|
strip = '$ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip'
|
|
pkg-config = ['/usr/bin/pkgconf']
|
|
|
|
[host_machine]
|
|
system = 'android'
|
|
cpu_family = '$cpu_family'
|
|
cpu = '$cpu'
|
|
endian = 'little'
|
|
|
|
[properties]
|
|
needs_exe_wrapper = true
|
|
pkg_config_libdir = '/usr/local/lib/${arch2}/pkgconfig/:/${ndk}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/${arch2}/pkgconfig/'
|
|
|
|
EOF
|