From c28b881c98fadcd3415370fad2525b558f6b03e4 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Tue, 27 Aug 2019 12:43:23 +0300 Subject: Android: Use LLVM tools where possible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Properly set CROSS_COMPILE qmake variable Fixes: QTBUG-77890 Change-Id: I73e22d0f936d35c373c064d30ea8d92005d79b2c Reviewed-by: Jörg Bornemann --- mkspecs/android-clang/qmake.conf | 12 ++++++++---- mkspecs/features/android/default_pre.prf | 11 ++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf index 21847cdc7c..81609c3962 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -50,10 +50,14 @@ QMAKE_CFLAGS_USE_PRECOMPILE = -include ${QMAKE_PCH_OUTPUT_BASE} QMAKE_CXXFLAGS_PRECOMPILE = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -NDK_LLVM_PATH = $$NDK_ROOT/toolchains/llvm/prebuilt/$$NDK_HOST -QMAKE_CC = $$NDK_LLVM_PATH/bin/clang -QMAKE_CXX = $$NDK_LLVM_PATH/bin/clang++ -QMAKE_LINK = $$QMAKE_CXX +NDK_LLVM_PATH = $$NDK_ROOT/toolchains/llvm/prebuilt/$$NDK_HOST +QMAKE_CC = $$NDK_LLVM_PATH/bin/clang +QMAKE_CXX = $$NDK_LLVM_PATH/bin/clang++ +QMAKE_LINK = $$QMAKE_CXX +QMAKE_OBJCOPY = $$NDK_LLVM_PATH/bin/llvm-objcopy +QMAKE_AR = $$NDK_LLVM_PATH/bin/llvm-ar cqs +QMAKE_OBJCOPY = $$NDK_LLVM_PATH/bin/llvm-objcopy +QMAKE_NM = $$NDK_LLVM_PATH/bin/llvm-nm -P QMAKE_CFLAGS_OPTIMIZE = -Oz QMAKE_CFLAGS_OPTIMIZE_FULL = -Oz diff --git a/mkspecs/features/android/default_pre.prf b/mkspecs/features/android/default_pre.prf index d4f84a8fcc..a73cd4b39c 100644 --- a/mkspecs/features/android/default_pre.prf +++ b/mkspecs/features/android/default_pre.prf @@ -61,14 +61,15 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD QMAKE_LIBS_EGL = -lEGL QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -# modifications to linux.conf -QMAKE_AR = $${CROSS_COMPILE}ar cqs -QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy -QMAKE_NM = $${CROSS_COMPILE}nm -P - QMAKE_STRIP = #$${CROSS_COMPILE}strip + +equals(QT_ARCH, x86): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/i686-linux-android- +else: equals(QT_ARCH, x86_64): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/x86_64-linux-android- +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_LINK_SHLIB = $$QMAKE_LINK QMAKE_LFLAGS = -- cgit v1.2.3