From f78044c0a403bccd7945103c37a32b8630f83a4e Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Mon, 15 Aug 2016 16:29:19 +0300 Subject: Android: Use -gcc-toolchain for clang linker command Change-Id: I0434d806dd9dafa12186c989e3b11964e41487fe Reviewed-by: Eskil Abrahamsen Blomfeldt --- mkspecs/android-g++/qmake.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs/android-g++') diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index 93bd5fa1c2..50d1fd6cf2 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -10,9 +10,9 @@ 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_GCC = $$QMAKE_CXX +QMAKE_CXX = $$QMAKE_GCC QMAKE_CFLAGS = +QMAKE_LINK = $$QMAKE_GCC include(../common/android-base-tail.conf) -- cgit v1.2.3 From 7e4f0ad9616fd2a6a736d318cffd162f9683a34f Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Wed, 10 Aug 2016 10:46:00 +0300 Subject: Android: use gold linker Change-Id: Ie09430cd02d431abc33af2ea79606f43882b7ccd Reviewed-by: Eskil Abrahamsen Blomfeldt --- mkspecs/android-g++/qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/android-g++') diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index 50d1fd6cf2..e05cc3f23a 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -13,6 +13,6 @@ QMAKE_CC = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-gcc QMAKE_CXX = $$QMAKE_GCC QMAKE_CFLAGS = -QMAKE_LINK = $$QMAKE_GCC +QMAKE_LINK = $$QMAKE_GCC -fuse-ld=gold include(../common/android-base-tail.conf) -- cgit v1.2.3 From 27a0ec9b9a9984741d9ea7e8d88e5bca5fe95693 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Tue, 16 Aug 2016 15:53:13 +0300 Subject: Revert "Android: use gold linker" It seems there is a configure test which should enable it. This reverts commit 7e4f0ad9616fd2a6a736d318cffd162f9683a34f. Change-Id: I39c594e5e779732d2f5954b42e266a1eaa1be3f0 Reviewed-by: Oswald Buddenhagen --- mkspecs/android-g++/qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/android-g++') diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index e05cc3f23a..50d1fd6cf2 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -13,6 +13,6 @@ QMAKE_CC = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-gcc QMAKE_CXX = $$QMAKE_GCC QMAKE_CFLAGS = -QMAKE_LINK = $$QMAKE_GCC -fuse-ld=gold +QMAKE_LINK = $$QMAKE_GCC include(../common/android-base-tail.conf) -- cgit v1.2.3