mirror of https://github.com/bitcoin/bitcoin
I need to try and patch around Qts buildsystem to keep #21778 moving along (the issue being that even when you tell Qt to build using Clang on Linux, it still calls out to GCC, breaking our ability to have a macOS release build env that doesn't have a GCC toolchain installed, and thus no ld binary). Before trying to patch Qt any further, update to the latest LTS release, and update the current patch set.pull/29732/head
parent
7a12cbed99
commit
430f319f73
@ -1,13 +0,0 @@
|
||||
Use Android NDK r23 LTS
|
||||
|
||||
--- old/qtbase/mkspecs/features/android/default_pre.prf
|
||||
+++ new/qtbase/mkspecs/features/android/default_pre.prf
|
||||
@@ -76,7 +76,7 @@ else: equals(QT_ARCH, x86_64): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/x86_64-linux-
|
||||
else: equals(QT_ARCH, arm64-v8a): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/aarch64-linux-android-
|
||||
else: CROSS_COMPILE = $$NDK_LLVM_PATH/bin/arm-linux-androideabi-
|
||||
|
||||
-QMAKE_RANLIB = $${CROSS_COMPILE}ranlib
|
||||
+QMAKE_RANLIB = $$NDK_LLVM_PATH/bin/llvm-ranlib
|
||||
QMAKE_LINK_SHLIB = $$QMAKE_LINK
|
||||
QMAKE_LFLAGS =
|
||||
|
Loading…
Reference in new issue