From e71d0402b0a45b2fbbc2be01160dd12a790801cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 14 Nov 2012 15:10:54 +0100 Subject: [PATCH] configure: Don't build qmake with MAC_SDK_FLAGS, it's a host tool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Passing -sdk to configure should affect the target build, not host tools. We skip passing MAC_SDK_FLAG for the host arch test as well, since as for qmake the SDK should only apply to the target. Change-Id: I3902355715234b9300a65d3095b9c925d9492311 Reviewed-by: Oswald Buddenhagen Reviewed-by: Tor Arne Vestbø --- configure | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/configure b/configure index 68531d28fe..2031396895 100755 --- a/configure +++ b/configure @@ -3672,13 +3672,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)" EXTRA_OBJS="qsettings_mac.o qcore_mac.o" EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\"" - if [ '!' -z "$CFG_SDK" ]; then - echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile" - echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile" - EXTRA_CFLAGS="$EXTRA_CFLAGS \$(SDK_CFLAGS)" - EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(SDK_CFLAGS)" - EXTRA_LFLAGS="$EXTRA_LFLAGS \$(SDK_LFLAGS)" - fi fi if [ '!' -z "$D_FLAGS" ]; then EXTRA_CFLAGS="$EXTRA_CFLAGS $D_FLAGS" @@ -3830,7 +3823,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" $MAC_SDK_FLAG + SYSROOT_FLAG= "$unixtests/arch.test" "$QMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" "$OUTFILE" "CFG_HOST" if [ $? -eq 0 ]; then eval `cat "$OUTFILE"` else