diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 00:07:19 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 00:07:20 +0200 |
| commit | fedcaf0256f0094d77f171e4cdca2c4e2469e606 (patch) | |
| tree | a7da9f63afbf22fb115a241612a4662e6957cd95 /mkspecs | |
| parent | 641eb4a96552615d898512723e2093abcaf7fbc1 (diff) | |
| parent | 473d9a5fc763d114fbfa1c0d2b5f8d03cab6e972 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I2715ee7c694e5579bcedc7bab0ae68e79d5fd0b6
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/android-clang/qmake.conf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf index b665000d00..1f5e690329 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -40,7 +40,11 @@ QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \ ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH ANDROID_STDCPP_PATH = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++_shared.so -ANDROID_CXX_STL_LIBS = -lc++ + +exists($$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so): \ + ANDROID_CXX_STL_LIBS = -lc++ +else: \ + ANDROID_CXX_STL_LIBS = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so.$$replace(ANDROID_PLATFORM, "android-", "") QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz |