From 98a079fcf7e12d17414ef27289a03cfb923be7a5 Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Wed, 15 Oct 2014 17:01:06 +1100
Subject: [PATCH] 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>
---
tools/qmake/mkspecs/features/functions.prf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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, =)
--
GitLab