Skip to content

Commit 14ecd9f

Browse files
committed
build: remove workaround for CMake 3.4.0
With the dependencies now requiring CMake 3.15, everything is built with a newer CMake. This removes the workaround for the 3.4 CMake release.
1 parent 746b58e commit 14ecd9f

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

utils/build-script-impl

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -573,26 +573,12 @@ function set_build_options_for_host() {
573573
-DLLVM_ENABLE_MODULES:BOOL="$(true_false ${LLVM_ENABLE_MODULES})"
574574
)
575575
if [[ $(is_llvm_lto_enabled) == "TRUE" ]]; then
576-
if [[ $(cmake_needs_to_specify_standard_computed_defaults) == "TRUE" ]]; then
577-
llvm_cmake_options+=(
578-
"-DCMAKE_C_STANDARD_COMPUTED_DEFAULT=AppleClang"
579-
"-DCMAKE_CXX_STANDARD_COMPUTED_DEFAULT=AppleClang"
580-
)
581-
fi
582-
583576
llvm_cmake_options+=(
584577
"-DLLVM_PARALLEL_LINK_JOBS=${LLVM_NUM_PARALLEL_LTO_LINK_JOBS}"
585578
)
586579
fi
587580

588581
if [[ $(is_swift_lto_enabled) == "TRUE" ]]; then
589-
if [[ $(cmake_needs_to_specify_standard_computed_defaults) = "TRUE" ]]; then
590-
swift_cmake_options+=(
591-
"-DCMAKE_C_STANDARD_COMPUTED_DEFAULT=AppleClang"
592-
"-DCMAKE_CXX_STANDARD_COMPUTED_DEFAULT=AppleClang"
593-
)
594-
fi
595-
596582
llvm_cmake_options+=(
597583
-DLLVM_ENABLE_MODULE_DEBUGGING:BOOL=NO
598584
)
@@ -914,14 +900,6 @@ function cmake_version() {
914900
"${CMAKE}" --version | grep "cmake version" | cut -f 3 -d " "
915901
}
916902

917-
function cmake_needs_to_specify_standard_computed_defaults() {
918-
if [[ $(cmake_version) = "3.4.0" ]]; then
919-
echo "TRUE"
920-
else
921-
echo "FALSE"
922-
fi
923-
}
924-
925903
# Sanitize the list of cross-compilation targets.
926904
#
927905
# In the Build/Host/Target paradigm:

0 commit comments

Comments
 (0)