summaryrefslogtreecommitdiffstats
path: root/mkspecs/android-g++
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2017-08-30 13:39:54 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2017-09-06 10:41:43 +0000
commit3fe08097967a4adfa8b523869339a706af649f64 (patch)
treefba352559d02ce464a93f662c0b83778a3c6c210 /mkspecs/android-g++
parent3b6fb8f22e1da418aa067978795b0442fa31a587 (diff)
Set the CROSS_COMPILE variable in Android mkspecs
All cross-target makespecs should set this variable. Change-Id: I176fa79e639b09c4c1134b66635c66d6e351d805 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'mkspecs/android-g++')
-rw-r--r--mkspecs/android-g++/qmake.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf
index 5e8a97c9d7..21afc52f2c 100644
--- a/mkspecs/android-g++/qmake.conf
+++ b/mkspecs/android-g++/qmake.conf
@@ -9,8 +9,8 @@ include(../common/linux.conf)
include(../common/gcc-base-unix.conf)
include(../common/android-base-head.conf)
-QMAKE_CC = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-gcc
-QMAKE_CXX = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-g++
+QMAKE_CC = $${CROSS_COMPILE}gcc
+QMAKE_CXX = $${CROSS_COMPILE}g++
QMAKE_LINK = $$QMAKE_CXX
ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/gnu-libstdc++/$$NDK_TOOLCHAIN_VERSION/libs/$$ANDROID_TARGET_ARCH