diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-09 13:06:22 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-05-09 13:06:22 +0000 |
| commit | 591116490cf313808e8ba05ddd066656a1d1a566 (patch) | |
| tree | 7aead440549b9052d1a53f4dbea08eb2b87c8be4 /mkspecs/common | |
| parent | 3d8ed3ba969ba958401dbf5e6760cf0788f1888e (diff) | |
| parent | e56d3b03ed92743f33eb7ca1a5aa61dbdedaf19b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/android-base-tail.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/common/android-base-tail.conf b/mkspecs/common/android-base-tail.conf index f403ef9330..edc255d08e 100644 --- a/mkspecs/common/android-base-tail.conf +++ b/mkspecs/common/android-base-tail.conf @@ -69,6 +69,7 @@ QMAKE_LIBDIR_OPENGL = QMAKE_LINK_SHLIB = $$QMAKE_LINK QMAKE_LFLAGS = --sysroot=$$ANDROID_PLATFORM_ROOT_PATH +equals(ANDROID_TARGET_ARCH, x86_64) QMAKE_LFLAGS += -L$$ANDROID_PLATFORM_ROOT_PATH/usr/lib64 QMAKE_LFLAGS_APP = -Wl,--no-undefined -Wl,-z,noexecstack -shared QMAKE_LFLAGS_SHLIB = -Wl,--no-undefined -Wl,-z,noexecstack -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |