diff options
| author | Gonzalo Exequiel Pedone | 2019-03-18 14:02:39 -0300 |
|---|---|---|
| committer | Gonzalo Exequiel Pedone | 2019-03-18 14:02:39 -0300 |
| commit | 8d1c149ee2af4d0abdab40695d4e6ecc56014e92 (patch) | |
| tree | 647d07dbf34b248641b78cdb0c1242a623cffe27 /0001-Fix-clang-build.patch | |
| parent | 897e78ae171b3ee8fdcb551d54848580cfc072ff (diff) | |
| download | aur-8d1c149ee2af4d0abdab40695d4e6ecc56014e92.tar.gz | |
Updated to qt 5.12.2.
Diffstat (limited to '0001-Fix-clang-build.patch')
| -rw-r--r-- | 0001-Fix-clang-build.patch | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/0001-Fix-clang-build.patch b/0001-Fix-clang-build.patch index 85c8fe3abc08..72f52ac0056e 100644 --- a/0001-Fix-clang-build.patch +++ b/0001-Fix-clang-build.patch @@ -1,9 +1,9 @@ --- a/qtbase/mkspecs/android-clang/qmake.conf 2019-02-07 11:03:08.250521061 -0300 +++ b/qtbase/mkspecs/android-clang/qmake.conf 2019-02-07 11:10:50.389466359 -0300 -@@ -31,11 +31,12 @@ +@@ -34,11 +34,12 @@ + QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a + equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a - 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 \ @@ -14,13 +14,3 @@ + -isystem $$NDK_ROOT/sysroot/usr/include ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH - -@@ -44,7 +45,7 @@ - ANDROID_USE_LLVM = true - - exists($$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so): \ -- ANDROID_CXX_STL_LIBS = -lc++ -+ ANDROID_CXX_STL_LIBS = -lc++_shared - else: \ - ANDROID_CXX_STL_LIBS = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so.$$replace(ANDROID_PLATFORM, "android-", "") - |