Merge pull request #2779 from apple/build-script-dont-duplicate-cmake-variables

build-script: don't duplicate product-invariant build settings in COMMON_CMAKE_OPTIONS

Author: gribozavr

utils/build-script-impl

@@ -1463,6 +1463,26 @@ for host in "${ALL_HOSTS[@]}"; do
         echo "Running Swift benchmarks for: ${SWIFT_RUN_BENCHMARK_TARGETS[@]}"
     fi
 
+    if [[ $(is_cross_tools_host ${host}) ]] ; then
+
+        if [[ "${CROSS_COMPILE_WITH_HOST_TOOLS}" ]]; then
+            # Optionally use the freshly-built host copy of clang to build
+            # for foreign hosts.
+            COMMON_CMAKE_OPTIONS+=(
+                -DCMAKE_C_COMPILER="$(build_directory ${LOCAL_HOST} llvm)/bin/clang"
+                -DCMAKE_CXX_COMPILER="$(build_directory ${LOCAL_HOST} llvm)/bin/clang++"
+            )
+        fi
+
+        # CMake can't relink when using Ninja, but that's okay -
+        # we don't need a build-local rpath because we can't run cross-compiled products
+        if [[ "${CMAKE_GENERATOR}" == "Ninja" ]]; then
+            COMMON_CMAKE_OPTIONS+=(
+                -DCMAKE_BUILD_WITH_INSTALL_RPATH="1"
+            )
+        fi
+    fi
+
     case "${COMPILER_VENDOR}" in
         none)
             ;;
@@ -1564,26 +1584,6 @@ for host in "${ALL_HOSTS[@]}"; do
         build_dir=$(build_directory ${host} ${product})
         build_targets=(all)
 
-        if [[ $(is_cross_tools_host ${host}) ]] ; then
-
-            if [[ "${CROSS_COMPILE_WITH_HOST_TOOLS}" ]]; then
-                # Optionally use the freshly-built host copy of clang to build
-                # for foreign hosts.
-                COMMON_CMAKE_OPTIONS+=(
-                    -DCMAKE_C_COMPILER="$(build_directory ${LOCAL_HOST} llvm)/bin/clang"
-                    -DCMAKE_CXX_COMPILER="$(build_directory ${LOCAL_HOST} llvm)/bin/clang++"
-                )
-            fi
-
-            # CMake can't relink when using Ninja, but that's okay -
-            # we don't need a build-local rpath because we can't run cross-compiled products
-            if [[ "${CMAKE_GENERATOR}" == "Ninja" ]]; then
-                COMMON_CMAKE_OPTIONS+=(
-                    -DCMAKE_BUILD_WITH_INSTALL_RPATH="1"
-                )
-            fi
-        fi
-        
         cmake_options=("${COMMON_CMAKE_OPTIONS[@]}")
 
         # Add in gold linker support if requested.