summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-02-15 11:57:08 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-18 17:07:13 +0100
commita1000de2b48d1105fcfb1e6f7ead4fdd71479b6d (patch)
tree07f6b3d52e0a3aad89800ecc7abbf9bfbdc0d829 /configure
parentdfde72e4361d82a782cb4da08ddcd0d8e8c40b07 (diff)
Ensure that arch.test for host runs with option(host_build)
So that mkspecs and features may rely on the host_build test. Change-Id: I18fee4820d9e2904285afcc7ddb8f1cc3d025fef Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 39e436d57c..47640b1026 100755
--- a/configure
+++ b/configure
@@ -3824,7 +3824,7 @@ compileTest()
# Use config.tests/arch/arch.pro to have the compiler tell us what the target architecture is
OUTFILE=$outpath/arch.result
-"$unixtests/arch.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" "$OUTFILE" "CFG" $MAC_SDK_FLAG
+"$unixtests/arch.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" "$OUTFILE" "target" $MAC_SDK_FLAG
if [ $? -eq 0 ]; then
eval `cat "$OUTFILE"`
else
@@ -3837,7 +3837,7 @@ rm -f "$OUTFILE" 2>/dev/null
if [ "$QMAKESPEC" != "$XQMAKESPEC" ]; then
# Do the same test again, using the host compiler
- SYSROOT_FLAG= "$unixtests/arch.test" "$QMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" "$OUTFILE" "CFG_HOST"
+ SYSROOT_FLAG= "$unixtests/arch.test" "$QMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" "$OUTFILE" "host"
if [ $? -eq 0 ]; then
eval `cat "$OUTFILE"`
else