summarylogtreecommitdiffstats
path: root/0001-Fix-clang-build.patch
blob: 431f20e727e1d6801a2cf4c79a8c150978b85c2b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
--- a/qtbase/mkspecs/android-clang/qmake.conf	2018-09-13 01:25:10.000000000 -0300
+++ b/qtbase/mkspecs/android-clang/qmake.conf	2018-09-23 15:53:19.000000000 -0300
@@ -31,16 +31,17 @@
 
 QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH
 QMAKE_LINK    = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a
-QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \
+QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$ANDROID_PLATFORM_ROOT_PATH \
                 -isystem $$NDK_ROOT/sysroot/usr/include/$$NDK_TOOLS_PREFIX \
                 -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++/include \
                 -isystem $$NDK_ROOT/sources/android/support/include \
-                -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++abi/include
+                -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++abi/include \
+                -isystem $$NDK_ROOT/sysroot/usr/include
 
 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