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>bb10
parent
9941719a8d
commit
176a216f4f
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue