diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-29 16:05:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-29 16:05:13 (GMT) |
| commit | 931d734a3ffa78a529c3eba32670994f9d6056bc (patch) | |
| tree | 830cd066372520da9f07cf0f1a8131f14d1b41e4 | |
| parent | 449a29296dfc33ec6772199db2d91827abe5376f (diff) | |
| parent | 1dbf485934da62b92bed63defb236254ffbeaa10 (diff) | |
| download | CMake-931d734a3ffa78a529c3eba32670994f9d6056bc.zip CMake-931d734a3ffa78a529c3eba32670994f9d6056bc.tar.gz CMake-931d734a3ffa78a529c3eba32670994f9d6056bc.tar.bz2 | |
Merge branch 'bootstrap-break' into release-3.16
Merge-request: !3959
| -rwxr-xr-x | bootstrap | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1092,7 +1092,7 @@ for std in 11 99 90; do "${TMPFILE}.c" >> cmake_bootstrap.log 2>&1; then cmake_c_compiler="${compiler}" cmake_c_flags="${cmake_c_flags} ${std_flag} ${thread_flag}" - break 3 + break 4 fi done done @@ -1203,7 +1203,7 @@ for std in 17 14 11; do "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then cmake_cxx_compiler="${compiler}" cmake_cxx_flags="${cmake_cxx_flags} ${std_flag} ${thread_flag} " - break 3 + break 4 fi done done |