diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-11-14 15:10:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-17 20:31:16 +0100 |
| commit | e71d0402b0a45b2fbbc2be01160dd12a790801cf (patch) | |
| tree | 992ea4bc3a992918be15ec2046b1bfdb34142b7a /configure | |
| parent | 8de8800de1523d8ed170076fc1cab15f44ec1806 (diff) | |
configure: Don't build qmake with MAC_SDK_FLAGS, it's a host tool
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 <oswald.buddenhagen@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -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 |