diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-28 20:19:36 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-01 16:18:49 +0000 |
| commit | e8dcd5038d8a6ee73f3efdd6fe5fbe276684feec (patch) | |
| tree | 35859282af2e20564d06dcc4bf06de0a1743b0ad /configure | |
| parent | 4b785eeaa9c46fadea6df65cadd7a8d4c1d7d272 (diff) | |
"frame" execution of config tests precisely
the purpose is to make build log parsers able to ignore build failures
in verbose configure output.
Change-Id: I01af2e019fd1b055fdfcf6749faeebacb7a39c3f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -3339,6 +3339,8 @@ fi # tests that don't need qmake (must be run before displaying help) #------------------------------------------------------------------------------- +echo "Running configuration tests (phase 1)..." + # detect build style if [ "$CFG_DEBUG" = "auto" ]; then if [ "$XPLATFORM_MAC" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then @@ -3611,6 +3613,8 @@ unset tty eval "`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog" | tee $tty`" unset tty +echo "Done running configuration tests." + #setup the build parts if [ -z "$CFG_BUILD_PARTS" ]; then CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS" @@ -4112,7 +4116,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; fi fi # Build qmake -echo "Running configuration tests..." +echo "Running configuration tests (phase 2)..." #------------------------------------------------------------------------------- # create a qt.conf for the Qt build tree itself @@ -6641,6 +6645,8 @@ s/icpc version \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\) .*$/QT_ICC_MAJOR_VERSION=\1; Q ;; esac +echo "Done running configuration tests." + #------------------------------------------------------------------------------- # part of configuration information goes into qconfig.h #------------------------------------------------------------------------------- |