summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-10-31 14:11:14 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-17 20:31:23 +0100
commit3250ec0c8f9666cd3dbb724894cd529d5af51ffb (patch)
tree74affd231417048befd7f241a61f02f32608fb67
parente71d0402b0a45b2fbbc2be01160dd12a790801cf (diff)
configure: Verify makespec before using it further
The chosen makespec may spit out errors for various reasons, which will influence steps such as detecting pkg-config or the architecture test. It's preferable to catch any issues with the makespec as early as possible and exit configure before the errors propagate to tests. Change-Id: Iecbf3217c36dea9f5e0677c58171b72cb6ce1e0b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
-rwxr-xr-xconfigure14
1 files changed, 14 insertions, 0 deletions
diff --git a/configure b/configure
index 2031396895..39e436d57c 100755
--- a/configure
+++ b/configure
@@ -3725,6 +3725,20 @@ else
fi
#-------------------------------------------------------------------------------
+# Verify makespec
+#-------------------------------------------------------------------------------
+QMAKE_OUTPUT=`$outpath/bin/qmake -E -nocache -spec "$XQMAKESPEC" "QT=" /dev/null 2>&1 >/dev/null`
+if [ $? != "0" ]; then
+ echo "Failed to process makespec for platform '$XPLATFORM'"
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+ echo "$QMAKE_OUTPUT"
+ else
+ echo "Turn on verbose messaging (-v) to see the final report."
+ fi
+ exit 101
+fi
+
+#-------------------------------------------------------------------------------
# Detect pkg-config
#-------------------------------------------------------------------------------
if [ -z "$PKG_CONFIG" ]; then