diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-30 13:25:40 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-30 09:25:48 -0400 |
| commit | 28a8561885d5d9e4a8e117545d77e6750031742a (patch) | |
| tree | a47ca1f181cac9da3cfc7b0ec4156047986eb456 /bootstrap | |
| parent | 5b64788c51f7676276c0d8685003fd002b27388b (diff) | |
| parent | 1dbf485934da62b92bed63defb236254ffbeaa10 (diff) | |
| download | cmake-28a8561885d5d9e4a8e117545d77e6750031742a.tar.gz | |
Merge topic 'bootstrap-break'
1dbf485934 bootstrap: Avoid redundant compiler selection checks
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3959
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1093,7 +1093,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 @@ -1204,7 +1204,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 |