diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-03-10 13:41:38 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2016-03-15 16:45:25 +0000 |
| commit | d1b09dba45c4b3ee0f31cd9bbf6941f17afd48f0 (patch) | |
| tree | f1daad63bc4eee1c4b92e5f10125954cccad88a9 /configure | |
| parent | a332a7d6c3afe310ae5fe00cbbdc3aadcfa597bb (diff) | |
Remove the c++default test
This test was the old way of checking whether to enable
c++11 functionality. That is now anyway required, so there
is no need for this test anymore.
Change-Id: I083e85a4698cac6bd9b573525c7b977f63e14113
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 16 |
1 files changed, 0 insertions, 16 deletions
@@ -4427,21 +4427,6 @@ if $stdcxx_error && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then exit 101 fi -# Detect which edition of the C++ standard the compiler defaults to -CFG_STDCXX_DEFAULT=199711 -if compileTest common/c++default "default C++ standard edition"; then - if [ -e "$outpath/config.tests/common/c++default/c++default.ii" ]; then - CFG_STDCXX_DEFAULT=`sed -n '/^[0-9]/s/L//p' "$outpath/config.tests/common/c++default/c++default.ii"` - else - if [ "$OPT_VERBOSE" = "yes" ]; then - echo "Failed to run the preprocessor, something is wrong with your compiler" - fi - if [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then - exit 101 - fi - fi -fi - # Detect whether 64-bit std::atomic works -- some 32-bit platforms require extra library support if compileTest common/atomic64 "64-bit std::atomic"; then CFG_ATOMIC64=yes @@ -6941,7 +6926,6 @@ fi if [ -n "$RPATH_FLAGS" ]; then echo "QMAKE_RPATHDIR += $RPATH_FLAGS" fi -echo "QT_COMPILER_STDCXX = $CFG_STDCXX_DEFAULT" if [ -n "$QT_GCC_MAJOR_VERSION" ]; then echo "QT_GCC_MAJOR_VERSION = $QT_GCC_MAJOR_VERSION" echo "QT_GCC_MINOR_VERSION = $QT_GCC_MINOR_VERSION" |