mirror of
https://github.com/Kitware/CMake.git
synced 2025-10-15 03:48:02 +08:00
bootstrap: Avoid redundant compiler selection checks
In commit 6e613ff399
(bootstrap: Add infrastructure to detect threading
flags, 2017-11-28, v3.11.0-rc1~281^2~1) an extra level of nesting was
added to the selection loop, but the inner-most `break` command used to
exit the loop on success was not updated. This caused the outer-most
loop to iterate unnecessarily and repeatedly try the same compilers
again. In the case of compilers requiring a `-std=` flag, this may have
caused the oldest standard to be used instead of the newest.
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user