b7a7e46fdd
The CC and CXX environmental variables cannot be set to the cross compiler, meson expects them to point to the native compiler and the build fails when meson tries to execute binaries compiled with CC and CXX, as part of the configure tests (sanitycheckc.exe fails to run). Unsetting CC and CXX means that clang and clang++ from the frida sdk is used instead of the ones from the android-ndk. This is probably fine for our purposes (and could otherwise be changed by patching releng/setup-env.sh).
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
--- ./releng/setup-env.sh.orig 2020-07-22 19:22:28.247685514 +0000
|
|
+++ ./releng/setup-env.sh 2020-07-22 19:23:37.730108226 +0000
|
|
@@ -527,26 +527,26 @@
|
|
host_cflags=""
|
|
case $host_arch in
|
|
x86)
|
|
- android_api=18
|
|
+ android_api=24
|
|
host_compiler_triplet="i686-linux-android"
|
|
host_arch_flags="-march=pentium4"
|
|
host_cflags="-mfpmath=sse -mstackrealign"
|
|
host_ldflags="-fuse-ld=gold"
|
|
;;
|
|
x86_64)
|
|
- android_api=21
|
|
+ android_api=24
|
|
host_compiler_triplet="x86_64-linux-android"
|
|
host_ldflags="-fuse-ld=gold -Wl,--icf=all"
|
|
;;
|
|
arm)
|
|
- android_api=18
|
|
+ android_api=24
|
|
host_compiler_triplet="armv7a-linux-androideabi"
|
|
host_tooltriplet="arm-linux-androideabi"
|
|
host_arch_flags="-march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16"
|
|
host_ldflags="-fuse-ld=gold -Wl,--icf=all -Wl,--fix-cortex-a8"
|
|
;;
|
|
arm64)
|
|
- android_api=21
|
|
+ android_api=24
|
|
host_compiler_triplet="aarch64-linux-android"
|
|
host_ldflags="-fuse-ld=gold -Wl,--icf=all"
|
|
;;
|