From e9837f79387c7b9cd8c1483f8f64352de07c5bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 6 Mar 2013 23:06:46 +0100 Subject: Teach configure's pro-file parser to understand host_build scopes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Is needed now that we write QMAKE_MAC_SDK with a !host_build scope in qdevice.pri. Change-Id: I298cc660b496460190337c175aef684a5522d5cb Reviewed-by: Tor Arne Vestbø --- configure | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 3231650a11..38f6375468 100755 --- a/configure +++ b/configure @@ -160,6 +160,12 @@ BEGIN { values["LITERAL_WHITESPACE"] = " " values["LITERAL_DOLLAR"] = "$" } +/^!?host_build:/ { + scopeStart = index($0, ":") + 1 + condition = substr($0, 0, scopeStart - 2) + if (condition != "'"$1"'") { next } + $0 = substr($0, scopeStart) +} /^[_A-Z0-9.]+[ \t]*\+?=/ { valStart = index($0, "=") + 1 @@ -225,7 +231,7 @@ getSingleQMakeVariable() getQMakeConf() { if [ -z "$specvals" ]; then - specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables` + specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" | extractQMakeVariables "host_build"` fi getSingleQMakeVariable "$1" "$specvals" } @@ -233,7 +239,7 @@ getQMakeConf() getXQMakeConf() { if [ -z "$xspecvals" ]; then - xspecvals=`expandQMakeConf "$XQMAKESPEC/qmake.conf" | extractQMakeVariables` + xspecvals=`expandQMakeConf "$XQMAKESPEC/qmake.conf" | extractQMakeVariables "!host_build"` fi getSingleQMakeVariable "$1" "$xspecvals" } -- cgit v1.2.3