AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Android: use gold linker"

Browse Source 
It seems there is a configure test which should enable it.

This reverts commit 7e4f0ad961.

Change-Id: I39c594e5e779732d2f5954b42e266a1eaa1be3f0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
BogDan Vatra 2016-08-16 15:53:13 +03:00
parent cc517d7cd9
commit 27a0ec9b9a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/android-clang/qmake.conf
View File

@ -28,6 +28,6 @@ else: equals(ANDROID_TARGET_ARCH, mips): \
else: equals(ANDROID_TARGET_ARCH, mips64): \ else: equals(ANDROID_TARGET_ARCH, mips64): \
QMAKE_CFLAGS = -target mips64el-none-linux-android QMAKE_CFLAGS = -target mips64el-none-linux-android
QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fuse-ld=gold QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -gcc-toolchain $$NDK_TOOLCHAIN_PATH
include(../common/android-base-tail.conf) include(../common/android-base-tail.conf)

2
mkspecs/android-g++/qmake.conf
View File

@ -13,6 +13,6 @@ QMAKE_CC = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX-gcc
QMAKE_CXX = $$QMAKE_GCC QMAKE_CXX = $$QMAKE_GCC
QMAKE_CFLAGS = QMAKE_CFLAGS =
QMAKE_LINK = $$QMAKE_GCC -fuse-ld=gold QMAKE_LINK = $$QMAKE_GCC
include(../common/android-base-tail.conf) include(../common/android-base-tail.conf)