Merge pull request swiftlang#28958 from compnerd/deprecated

build: remove workaround for CMake 3.4.0

Author: compnerd

utils/build-script-impl

@@ -555,26 +555,12 @@ function set_build_options_for_host() {
                 -DLLVM_ENABLE_MODULES:BOOL="$(true_false ${LLVM_ENABLE_MODULES})"
             )
             if [[ $(is_llvm_lto_enabled) == "TRUE" ]]; then
-                if [[ $(cmake_needs_to_specify_standard_computed_defaults) == "TRUE" ]]; then
-                    llvm_cmake_options+=(
-                        "-DCMAKE_C_STANDARD_COMPUTED_DEFAULT=AppleClang"
-                        "-DCMAKE_CXX_STANDARD_COMPUTED_DEFAULT=AppleClang"
-                    )
-                fi
-
                 llvm_cmake_options+=(
                     "-DLLVM_PARALLEL_LINK_JOBS=${LLVM_NUM_PARALLEL_LTO_LINK_JOBS}"
                 )
             fi
 
             if [[ $(is_swift_lto_enabled) == "TRUE" ]]; then
-                if [[ $(cmake_needs_to_specify_standard_computed_defaults) = "TRUE" ]]; then
-                    swift_cmake_options+=(
-                        "-DCMAKE_C_STANDARD_COMPUTED_DEFAULT=AppleClang"
-                        "-DCMAKE_CXX_STANDARD_COMPUTED_DEFAULT=AppleClang"
-                    )
-                fi
-
                 llvm_cmake_options+=(
                     -DLLVM_ENABLE_MODULE_DEBUGGING:BOOL=NO
                 )
@@ -896,14 +882,6 @@ function cmake_version() {
     "${CMAKE}" --version | grep "cmake version" | cut -f 3 -d " "
 }
 
-function cmake_needs_to_specify_standard_computed_defaults() {
-    if [[ $(cmake_version) = "3.4.0" ]]; then
-        echo "TRUE"
-    else
-        echo "FALSE"
-    fi
-}
-
 # Sanitize the list of cross-compilation targets.
 #
 # In the Build/Host/Target paradigm: