|author||Girish Ramakrishnan <email@example.com>||2012-03-27 18:59:30 -0700|
|committer||Qt by Nokia <firstname.lastname@example.org>||2012-03-28 19:34:42 +0200|
Remove sysroot detection
configure parses the compiler from the mkspecs using an awk script. The detected compiler is then used to determine sysroot support. The awk script is currently unable to handle loading of qmake features and thus configure will not detect the compiler correctly. This is the case when using device profiles. The qdevice.pri is loaded through the qmake feature file device_config.prf. One possible way to fix this is to move this detection after qmake is built and make this a .pro based config.test. However, this cannot be done because the sysroot is actually baked into the qmake binary as the QT_SYSROOT variable. The solution is to remove this check completely and let the build fail when Qt starts compiling with --sysroot. Change-Id: I6c3b7ec2c8e5e390d6f5b1e602d656682d610b98 Reviewed-by: Oswald Buddenhagen <email@example.com>
Diffstat (limited to 'configure')
1 files changed, 3 insertions, 8 deletions
@@ -2538,15 +2538,10 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
if [ -n "$CFG_SYSROOT" ]; then
- if compilerSupportsFlag --sysroot="$CFG_SYSROOT"; then
- [ "$OPT_VERBOSE" = "yes" ] && echo "Setting sysroot to: $CFG_SYSROOT"
- echo >&2 "The compiler doesn't support the --sysroot flag, I can't set the sysroot"
- exit 1
export SYSROOT_FLAG # used by config.tests/unix/compile.test