diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2018-09-21 13:31:24 +0200 |
|---|---|---|
| committer | André Klitzing <aklitzing@gmail.com> | 2018-09-25 19:29:54 +0000 |
| commit | 176a216f4f6c36c769e9b667c12717c277a003ca (patch) | |
| tree | 54cc79a06bb233629de8afc6048e53f7a027e95f /mkspecs/android-clang/qmake.conf | |
| parent | 9941719a8dc60cb7edfa719605c89c3fac4b2346 (diff) | |
Android: Compile with NDK r18 + clang
In NDK version r18, the libc++.so file we used for clang has been
removed. However, in r17 this was actually just redirecting to
libc++_shared.so, which is still available in r18, so we can
link directly to that instead.
[ChangeLog][Android] Fix build issue with Android NDK r18 and clang.
Task-number: QTBUG-70631
Change-Id: I658c0cabf49f27a47f38305de3c86067c8b18b25
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'mkspecs/android-clang/qmake.conf')
| -rw-r--r-- | mkspecs/android-clang/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf index b665000d00..953b13dc37 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -40,7 +40,7 @@ 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++ +ANDROID_CXX_STL_LIBS = -lc++_shared QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz |