1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't scope QMAKE_MAC_SDK assignment in qdevice.pri any more

Browse Source 
host builds are using qhost.pri since c23a086e4.

Change-Id: I312a7fdbdf8a392d74905d52d02bcb77459063cc
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-11-23 20:48:12 +01:00
parent d004e086a2
commit 1510c19aff
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -188,12 +188,6 @@ BEGIN {
values["LITERAL_WHITESPACE"] = " " values["LITERAL_WHITESPACE"] = " "
values["LITERAL_DOLLAR"] = "$" 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]*\+?=/ { /^[_A-Z0-9.]+[ \t]*\+?=/ {
valStart = index($0, "=") + 1 valStart = index($0, "=") + 1
@ -318,7 +312,7 @@ macSDKify()
getQMakeConf() getQMakeConf()
{ {
if [ -z "$specvals" ]; then if [ -z "$specvals" ]; then
specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" "$HOST_VARS_FILE" | extractQMakeVariables "host_build"` specvals=`expandQMakeConf "$QMAKESPEC/qmake.conf" "$HOST_VARS_FILE" | extractQMakeVariables`
if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi if [ "$BUILD_ON_MAC" = "yes" ]; then specvals=$(macSDKify "$specvals"); fi
fi fi
getSingleQMakeVariable "$1" "$specvals" getSingleQMakeVariable "$1" "$specvals"
@ -327,7 +321,7 @@ getQMakeConf()
getXQMakeConf() getXQMakeConf()
{ {
if [ -z "$xspecvals" ]; then if [ -z "$xspecvals" ]; then
xspecvals=`expandQMakeConf "$XQMAKESPEC/qmake.conf" "$DEVICE_VARS_FILE" | extractQMakeVariables "!host_build"` xspecvals=`expandQMakeConf "$XQMAKESPEC/qmake.conf" "$DEVICE_VARS_FILE" | extractQMakeVariables`
if [ "$XPLATFORM_MAC" = "yes" ]; then xspecvals=$(macSDKify "$xspecvals"); fi if [ "$XPLATFORM_MAC" = "yes" ]; then xspecvals=$(macSDKify "$xspecvals"); fi
fi fi
getSingleQMakeVariable "$1" "$xspecvals" getSingleQMakeVariable "$1" "$xspecvals"
@ -683,7 +677,7 @@ while [ "$#" -gt 0 ]; do
;; ;;
sdk) sdk)
if [ "$BUILD_ON_MAC" = "yes" ]; then if [ "$BUILD_ON_MAC" = "yes" ]; then
DeviceVar set !host_build:QMAKE_MAC_SDK "$VAL" DeviceVar set QMAKE_MAC_SDK "$VAL"
OPT_MAC_SDK="$VAL" OPT_MAC_SDK="$VAL"
else else
UNKNOWN_OPT=yes UNKNOWN_OPT=yes