Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

utils/build-script-impl

@@ -3227,6 +3227,10 @@ for host in "${ALL_HOSTS[@]}"; do
                   continue
                 ;;
                 *)
+                  cmake_options=(
+                    ${cmake_options[@]}
+                    -DCMAKE_Swift_COMPILER:PATH="$(build_directory_bin ${LOCAL_HOST} swift)/swiftc"
+                  )
                   results_targets=( "test" )
                   executable_target=""
                 ;;