summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorDanny Boelens <dannyb@enfocus.com>2013-02-20 17:11:53 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-22 10:46:56 (GMT)
commit0f834a07bb3feb2ff8ac74d4107a592e30b17863 (patch)
tree23c5fa0760b83c97101d3e3f3e8a55b1e7e4576e /configure
parent9b0922e64152bd4cd06932df247a5f80e9d069cb (diff)
downloadQt-0f834a07bb3feb2ff8ac74d4107a592e30b17863.zip
Qt-0f834a07bb3feb2ff8ac74d4107a592e30b17863.tar.gz
Qt-0f834a07bb3feb2ff8ac74d4107a592e30b17863.tar.bz2
Fix Mac OS X crc/dwarf2 test for non-default Xcode setup.
The crc.test and dwarf2.test scripts are now using the SDK and arch settings passed to it. If you install Xcode without the "UNIX Development" option, this is essential to let the compiler find standard headers and let the test program compile successfully. In addition, let configure pass the SDK and arch settings given on the command line to the scripts. These scripts are no longer present in Qt 5. Change-Id: I78c0b3594b91827a6618a9a152949e9201ca64c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 7134faf..bb04cf7 100755
--- a/configure
+++ b/configure
@@ -3459,7 +3459,7 @@ fi
#auto-detect DWARF2 on the mac
if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then
- if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then
+ if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" $MAC_CONFIG_TEST_COMMANDLINE; then
CFG_MAC_DWARF2=no
else
CFG_MAC_DWARF2=yes
@@ -5836,7 +5836,7 @@ fi
# This should mean that you really *can* load two Qt's and have our custom
# Carbon events work.
if [ "$PLATFORM_MAC" = "yes" -a ! -z "$QT_NAMESPACE" ]; then
- QT_NAMESPACE_MAC_CRC=`"$mactests/crc.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/crc $QT_NAMESPACE $L_FLAGS $I_FLAGS $l_FLAGS`
+ QT_NAMESPACE_MAC_CRC=`"$mactests/crc.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/crc $QT_NAMESPACE $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE`
fi
# X11/QWS/Lighthouse