summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorTor Arne Vestbø <torarnv@gmail.com>2013-03-06 13:52:46 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-06 19:03:39 +0100
commit75ee22dab0e817e2ba45ab488a008e5a96e3d2c0 (patch)
tree3be950e63966bf8857641724bd36644b40a243a6 /configure
parentc6a689f64fa4d2db55206ef7d63baebdf4c7befd (diff)
Fix build of host_build when a -sdk was passed to configure
qdevice.pri is not target/host specific yet, so we were loading it and overriding QMAKE_MAC_SDK to iphonesimulator eg., even for host tools such as moc. Change-Id: I10277e60e1da84dda239e32a6f19b40dc48f084a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 795d62eeaa..3231650a11 100755
--- a/configure
+++ b/configure
@@ -1330,7 +1330,7 @@ while [ "$#" -gt 0 ]; do
;;
sdk)
if [ "$BUILD_ON_MAC" = "yes" ]; then
- DeviceVar set QMAKE_MAC_SDK "$VAL"
+ DeviceVar set !host_build:QMAKE_MAC_SDK "$VAL"
else
UNKNOWN_OPT=yes
fi