diff options
author | Martchus | 2017-06-08 21:33:56 +0200 |
---|---|---|
committer | Martchus | 2017-06-08 21:33:56 +0200 |
commit | 3df6482af8c916f5105111d1dcf6711e01a56c47 (patch) | |
tree | 55879cff03b12573e665e21cdd7c7d7e65df1c2d /0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch | |
parent | 288f048fafcb5879c7c038c7e507b6ea98732b93 (diff) | |
download | aur-3df6482af8c916f5105111d1dcf6711e01a56c47.tar.gz |
Update to 5.9.0
Diffstat (limited to '0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch')
-rw-r--r-- | 0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch new file mode 100644 index 000000000000..709f57226f81 --- /dev/null +++ b/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch @@ -0,0 +1,26 @@ +From 7d3b433e7a103e2f26cf183e1d9910b4d33a97ec Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 18:20:25 +0200 +Subject: [PATCH 20/31] Disable determing default include and lib dirs at qmake + time when building with mingw-w64 + +--- + mkspecs/features/toolchain.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf +index 46a9c5707a..e82383f9ff 100644 +--- a/mkspecs/features/toolchain.prf ++++ b/mkspecs/features/toolchain.prf +@@ -21,7 +21,7 @@ isEmpty($${target_prefix}.INCDIRS) { + # + # Get default include and library paths from compiler + # +- gcc { ++ !win32:gcc { + !equals(QMAKE_HOST.os, Windows) { + cmd_prefix = "LC_ALL=C" + cmd_suffix = "</dev/null >/dev/null" +-- +2.13.0 + |