diff options
| author | Jonathan Liu <net147@gmail.com> | 2014-10-15 17:01:06 +1100 |
|---|---|---|
| committer | Jonathan Liu <net147@gmail.com> | 2014-10-15 11:47:31 +0200 |
| commit | 98a079fcf7e12d17414ef27289a03cfb923be7a5 (patch) | |
| tree | 032993beff8a115842b54b03ce2dd92c10cda3d3 /tools | |
| parent | 6b64f42363308a80044cc85ae8ba6c9bf1aac8a7 (diff) | |
Include QMAKE_CC when extracting C compiler flags
This fixes cross-compile settings detection for cross-compilation
environments where the C compiler cross-compilation flags are set in
CC/QMAKE_CC instead of CFLAGS/QMAKE_CFLAGS (e.g. OpenEmbedded).
Change-Id: I0a7b0f6c47a00775ec18073a16359c8351363285
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 789af9a13..06713d4dc 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -35,7 +35,7 @@ defineReplace(getChromiumSrcDir) { } defineReplace(extractCFlag) { - CFLAGS = $$QMAKE_CFLAGS + CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS !isEmpty(ANDROID_TARGET_CFLAGS): CFLAGS = $$ANDROID_TARGET_CFLAGS OPTION = $$find(CFLAGS, $$1) OPTION = $$split(OPTION, =) |