Merge branch 'bootstrap-break' into release-3.16

Merge-request: !3959
This commit is contained in:
Brad King 2019-10-29 12:05:13 -04:00
commit 931d734a3f

View File

@ -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