diff options
author | BogDan Vatra <bogdan@kdab.com> | 2016-08-15 16:29:19 +0300 |
---|---|---|
committer | BogDan Vatra <bogdan@kdab.com> | 2016-08-15 13:30:58 +0000 |
commit | f78044c0a403bccd7945103c37a32b8630f83a4e (patch) | |
tree | 6750187db13623ddca66e920b3ce5aa0eeb073ec /mkspecs/android-clang | |
parent | bc60216945af092c3a3730354dc63359d39ad5bd (diff) |
Android: Use -gcc-toolchain for clang linker command
Change-Id: I0434d806dd9dafa12186c989e3b11964e41487fe
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'mkspecs/android-clang')
-rw-r--r-- | mkspecs/android-clang/qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf index 6d53bb921d..faba0e0d03 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -12,7 +12,6 @@ include(../common/android-base-head.conf) 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_GCC = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-g++ equals(ANDROID_TARGET_ARCH, armeabi-v7a): \ QMAKE_CFLAGS = -target armv7-none-linux-androideabi @@ -29,4 +28,6 @@ else: equals(ANDROID_TARGET_ARCH, mips): \ else: equals(ANDROID_TARGET_ARCH, mips64): \ QMAKE_CFLAGS = -target mips64el-none-linux-android +QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -gcc-toolchain $$NDK_TOOLCHAIN_PATH + include(../common/android-base-tail.conf) |