summarylogtreecommitdiffstats
path: root/0001-Fix-clang-build.patch
diff options
context:
space:
mode:
authorGonzalo Exequiel Pedone2019-06-27 21:14:01 -0300
committerGonzalo Exequiel Pedone2019-06-27 21:14:01 -0300
commit87d9c82854765d923eba8326af5ec5760a697a61 (patch)
tree510780a2122ebc3b18fbcda5902f67d56ae2e1b1 /0001-Fix-clang-build.patch
parentda346ca99ce0cdfb3f0e02a11ad7351856b3b56d (diff)
downloadaur-87d9c82854765d923eba8326af5ec5760a697a61.tar.gz
Package updated to Qt 5.13.0.
Diffstat (limited to '0001-Fix-clang-build.patch')
-rw-r--r--0001-Fix-clang-build.patch10
1 files changed, 2 insertions, 8 deletions
diff --git a/0001-Fix-clang-build.patch b/0001-Fix-clang-build.patch
index 47df6b70783..aa83bd5b005 100644
--- a/0001-Fix-clang-build.patch
+++ b/0001-Fix-clang-build.patch
@@ -1,6 +1,6 @@
--- a/qtbase/mkspecs/android-clang/qmake.conf 2019-04-09 06:51:26.000000000 -0300
+++ b/qtbase/mkspecs/android-clang/qmake.conf 2019-06-10 15:27:30.837639900 -0300
-@@ -15,30 +15,26 @@
+@@ -15,26 +15,22 @@
QMAKE_CXX = $$NDK_LLVM_PATH/bin/clang++
equals(ANDROID_TARGET_ARCH, armeabi-v7a): \
@@ -18,12 +18,6 @@
else: equals(ANDROID_TARGET_ARCH, x86_64): \
- QMAKE_CFLAGS += -target x86_64-none-linux-android
+ QMAKE_CFLAGS += -target x86_64-linux-android$$replace(ANDROID_PLATFORM, "android-", "")
- else: equals(ANDROID_TARGET_ARCH, mips): \
-- QMAKE_CFLAGS += -target mipsel-none-linux-android
-+ QMAKE_CFLAGS += -target mipsel-linux-android$$replace(ANDROID_PLATFORM, "android-", "")
- else: equals(ANDROID_TARGET_ARCH, mips64): \
-- QMAKE_CFLAGS += -target mips64el-none-linux-android
-+ QMAKE_CFLAGS += -target mips64el-linux-android$$replace(ANDROID_PLATFORM, "android-", "")
QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info
@@ -39,7 +33,7 @@
ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH
-@@ -54,3 +50,6 @@
+@@ -50,3 +46,6 @@
QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
include(../common/android-base-tail.conf)