From 32a3413b138ed93c492b5d48278b6a71fae92c49 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 17 Oct 2016 21:18:57 +0200
Subject: make-expand cflags before passing them to $$system()

mac/sdk.prf puts some indirections into them.

Task-number: QTBUG-56580
Change-Id: I8ffd2438309702466edd3ad5c51284c7cab4fda9
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
---
 mkspecs/features/toolchain.prf | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'mkspecs/features/toolchain.prf')

diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
index 70547a3cdf..87fe7e40a8 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
@@ -1,4 +1,14 @@
 
+defineReplace(qtMakeExpand) {
+    out = "$$1"
+    for(ever) {
+        m = $$replace(out, .*\\$\\(EXPORT_([^)]+)\\).*, \\1)
+        equals(m, $$out): \
+            return($$out)
+        out = $$replace(out, \\$\\(EXPORT_$$m\\), $$eval($$m))
+    }
+}
+
 isEmpty(QMAKE_DEFAULT_INCDIRS):!host_build {
     #
     # Get default include and library paths from compiler
@@ -11,7 +21,7 @@ isEmpty(QMAKE_DEFAULT_INCDIRS):!host_build {
             cmd_prefix = "set LC_ALL=C&"
             cmd_suffix = "<NUL >NUL"
         }
-        output = $$system("$$cmd_prefix $$QMAKE_CXX $$QMAKE_CXXFLAGS -xc++ -E -v - 2>&1 $$cmd_suffix", lines)
+        output = $$system("$$cmd_prefix $$QMAKE_CXX $$qtMakeExpand($$QMAKE_CXXFLAGS) -xc++ -E -v - 2>&1 $$cmd_suffix", lines)
         add_includes = false
         for (line, output) {
             line ~= s/^ *//  # remove leading spaces
-- 
cgit v1.2.3