blob: 398c0ae51f454eac51ffd0938d38c530e8246548 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Wed, 2 Feb 2011 18:00:51 +0100
Subject: [PATCH] qmake: make sure local include dirs come first.
This fixes the issue where a pcre.h from a include path from
CXXFLAGS is used instead of the one in webkit.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
qmake/generators/unix/unixmake.cpp | 2 +-
qmake/generators/unix/unixmake2.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 0f06b814e4d6..5f7556832c4e 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -246,7 +246,7 @@ UnixMakefileGenerator::init()
cflags += " $(CFLAGS)";
else
cflags += " $(" + comps[i] + "FLAGS)";
- compile_flag += cflags + " $(INCPATH)";
+ compile_flag += " $(INCPATH)" + cflags;
QString compiler = comps[i];
if (compiler == "C")
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 50af9d23e1d7..aecd61d0ed18 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -999,7 +999,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
compiler = "$(CXX)";
// compile command
- t << "\n\t" << compiler << cflags << " $(INCPATH) " << pchFlags << endl << endl;
+ t << "\n\t" << compiler << " $(INCPATH) " << cflags << " " << pchFlags << endl << endl;
}
}
|
