From 493b4311ff3995118ac5c15f49803447c8fba854 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 3 Jul 2012 16:19:28 +0200 Subject: [PATCH] don't match on the spec name in qconfig.pri this will fail now even on unix (and wouldn't have ever worked on windows), as the full spec name is known only after reading the spec, and qconfig.pri is read from inside the spec. matching on the host_build flag is cleaner anyway. Change-Id: I7da144e89ab3db0fad942d755d8cb0a0f3b85588 Reviewed-by: Thiago Macieira Reviewed-by: Donald Carr Reviewed-by: Girish Ramakrishnan --- configure | 2 +- tools/configure/configureapp.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 2f590ba..27b93e7 100755 --- a/configure +++ b/configure @@ -5806,7 +5806,7 @@ fi if [ -n "$CFG_SYSROOT" ]; then echo "# sysroot" >>"$QTCONFIG.tmp" - echo `basename "$XQMAKESPEC"` \{ >>"$QTCONFIG.tmp" + echo "!host_build {" >>"$QTCONFIG.tmp" echo " QMAKE_CFLAGS += --sysroot=\$\$[QT_SYSROOT]" >>"$QTCONFIG.tmp" echo " QMAKE_CXXFLAGS += --sysroot=\$\$[QT_SYSROOT]" >>"$QTCONFIG.tmp" echo " QMAKE_LFLAGS += --sysroot=\$\$[QT_SYSROOT]" >>"$QTCONFIG.tmp" diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 38171f5..a192f8a 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2940,10 +2940,9 @@ void Configure::generateQConfigPri() << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl; if (!dictionary["CFG_SYSROOT"].isEmpty()) { - QString targetSpec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : dictionary[ "QMAKESPEC" ]; configStream << endl << "# sysroot" << endl - << targetSpec << " {" << endl + << "!host_build {" << endl << " QMAKE_CFLAGS += --sysroot=$$[QT_SYSROOT]" << endl << " QMAKE_CXXFLAGS += --sysroot=$$[QT_SYSROOT]" << endl << " QMAKE_LFLAGS += --sysroot=$$[QT_SYSROOT]" << endl -- 2.7.4