diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0021-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0021-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0021-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0021-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch new file mode 100644 index 00000000..01ef5b88 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0021-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 7248a700e9c4ed1df41dbfcfebcd32bb6951bd36 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 6 Dec 2018 15:06:20 -0800 | ||
4 | Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux | ||
5 | |||
6 | This is required when using clang for compiler, fixes | ||
7 | mkspecs/features/toolchain.prf:215: Variable QMAKE_CXX.COMPILER_MACROS is not defined. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | mkspecs/features/toolchain.prf | 11 ++++++++++- | ||
13 | 1 file changed, 10 insertions(+), 1 deletion(-) | ||
14 | |||
15 | Index: git/mkspecs/features/toolchain.prf | ||
16 | =================================================================== | ||
17 | --- git.orig/mkspecs/features/toolchain.prf | ||
18 | +++ git/mkspecs/features/toolchain.prf | ||
19 | @@ -180,6 +180,13 @@ defineReplace(qtVariablesFromGCC) { | ||
20 | return($$ret) | ||
21 | } | ||
22 | |||
23 | +defineReplace(qtVariablesFromCLANG) { | ||
24 | + ret = $$system("$$1 $$2 -E $$system_quote($$PWD/data/macros.cpp) \ | ||
25 | + <$$QMAKE_SYSTEM_NULL_DEVICE 2>$$QMAKE_SYSTEM_NULL_DEVICE", lines, ec) | ||
26 | + !equals(ec, 0): qtCompilerErrror($$1, $$ret) | ||
27 | + return($$ret) | ||
28 | +} | ||
29 | + | ||
30 | isEmpty($${target_prefix}.COMPILER_MACROS) { | ||
31 | msvc { | ||
32 | clang_cl { | ||
33 | @@ -199,6 +206,8 @@ isEmpty($${target_prefix}.COMPILER_MACRO | ||
34 | } else { | ||
35 | vars = $$qtVariablesFromMSVC($$QMAKE_CXX) | ||
36 | } | ||
37 | + } else: clang { | ||
38 | + vars = $$qtVariablesFromCLANG($$QMAKE_CXX, $$QMAKE_CXXFLAGS) | ||
39 | } else: gcc { | ||
40 | vars = $$qtVariablesFromGCC($$QMAKE_CXX) | ||
41 | } | ||