diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-03 12:32:48 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-18 17:10:52 +0000 |
| commit | d90db0f136d727f8e6b9a566eee3eae80cd7d81e (patch) | |
| tree | ff60b68d6e6cb517fa712efc02cd3b266b3aa699 /configure | |
| parent | 97b856b78859861f16304debad29889f691d9eb7 (diff) | |
| download | qtbase-d90db0f136d727f8e6b9a566eee3eae80cd7d81e.tar.gz | |
rewrite makespec verification with qmake based system
cleaner, and covers windows as well.
Change-Id: I0e884909a3f49610fab750ba1ef6112f43e5d5d1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 17 |
1 files changed, 0 insertions, 17 deletions
@@ -398,10 +398,7 @@ BUILD_ON_MAC=no if [ -d /System/Library/Frameworks/Carbon.framework ]; then BUILD_ON_MAC=yes fi -DEV_NULL=/dev/null if [ "$OSTYPE" = "msys" ]; then - DEV_NULL=/tmp/empty-file - echo "" > $DEV_NULL relpath=`(cd "$relpath"; pwd -W)` outpath=`pwd -W` fi @@ -1864,20 +1861,6 @@ else fi #------------------------------------------------------------------------------- -# Verify makespec -#------------------------------------------------------------------------------- -QMAKE_OUTPUT=`"$CFG_QMAKE_PATH" -qtconf "$QTCONFFILE" -E -nocache -spec "$XQMAKESPEC" "QT=" $DEV_NULL 2>&1` -if [ $? != "0" ]; then - echo "Failed to process makespec for platform '$XPLATFORM'" - if [ "$OPT_VERBOSE" = "yes" ]; then - echo "$QMAKE_OUTPUT" - else - echo "Turn on verbose messaging (-v) to see the final report." - fi - exit 101 -fi - -#------------------------------------------------------------------------------- # run configure tests #------------------------------------------------------------------------------- |