[SwiftPM] Build with foundation

Author: Bouke

utils/build-script

@@ -991,10 +991,10 @@ details of the setups of other systems or automated environments.""")
     if args.test_optimized:
         args.test = True
 
-    # XCTest has a dependency on Foundation.
+    # SwiftPM and XCTest have a dependency on Foundation.
     # On OS X, Foundation is built automatically using xcodebuild.
     # On Linux, we must ensure that it is built manually.
-    if args.build_xctest and platform.system() != "Darwin":
+    if (args.build_swiftpm or args.build_xctest) and platform.system() != "Darwin":
         args.build_foundation = True
 
     # --skip-test-ios is merely a shorthand for host and simulator tests.

utils/build-script-impl

@@ -990,20 +990,22 @@ fi
 if [[ ! "${SKIP_BUILD_LLBUILD}" ]] ; then
      PRODUCTS=("${PRODUCTS[@]}" llbuild)
 fi
-if [[ ! "${SKIP_BUILD_SWIFTPM}" ]] ; then
-     PRODUCTS=("${PRODUCTS[@]}" swiftpm)
-fi
 if [[ ! "${SKIP_BUILD_LIBDISPATCH}" ]] ; then
      PRODUCTS=("${PRODUCTS[@]}" libdispatch)
 fi
-# XCTest has a dependency on Foundation, so Foundation must be added to the
-# list of build products first.
+# SwiftPM and XCTest are dependent on Foundation, so Foundation must be
+# added to the list of build products first.
 if [[ ! "${SKIP_BUILD_FOUNDATION}" ]] ; then
      PRODUCTS=("${PRODUCTS[@]}" foundation)
 fi
+# SwiftPM is dependent on XCTest, so XCTest must be added to the list of
+# build products first.
 if [[ ! "${SKIP_BUILD_XCTEST}" ]] ; then
      PRODUCTS=("${PRODUCTS[@]}" xctest)
 fi
+if [[ ! "${SKIP_BUILD_SWIFTPM}" ]] ; then
+     PRODUCTS=("${PRODUCTS[@]}" swiftpm)
+fi
 
 SWIFT_STDLIB_TARGETS=()
 SWIFT_BENCHMARK_TARGETS=()
@@ -1309,9 +1311,11 @@ function cmake_config_opt() {
 function set_swiftpm_bootstrap_command() {
     SWIFTC_BIN="$(build_directory_bin ${deployment_target} swift)/swiftc"
     LLBUILD_BIN="$(build_directory_bin ${deployment_target} llbuild)/swift-build-tool"
-    if [[ ! "${SKIP_BUILD_FOUNDATION}" && ! "${SKIP_BUILD_XCTEST}" ]] ; then
+    if [[ ! "${SKIP_BUILD_FOUNDATION}" ]] ; then
         FOUNDATION_BUILD_DIR=$(build_directory ${deployment_target} foundation)
-        XCTEST_BUILD_DIR=$(build_directory ${deployment_target} xctest)
+        if [[ ! "${SKIP_BUILD_XCTEST}" ]] ; then
+            XCTEST_BUILD_DIR=$(build_directory ${deployment_target} xctest)
+        fi
     fi
     if [ ! -e "${LLBUILD_BIN}" ]; then
         echo "Error: Cannot build swiftpm without llbuild (swift-build-tool)."
@@ -1325,10 +1329,13 @@ function set_swiftpm_bootstrap_command() {
         --swiftc="${SWIFTC_BIN}"
         --sbt="${LLBUILD_BIN}"
         --build="${build_dir}")
-    if [[ ! "${SKIP_BUILD_FOUNDATION}" && ! "${SKIP_BUILD_XCTEST}" ]] ; then
+    if [[ ! "${SKIP_BUILD_FOUNDATION}" ]] ; then
         swiftpm_bootstrap_command+=(
-            --foundation="${FOUNDATION_BUILD_DIR}/Foundation"
-            --xctest="${XCTEST_BUILD_DIR}")
+            --foundation="${FOUNDATION_BUILD_DIR}/Foundation")
+        if [[ ! "${SKIP_BUILD_XCTEST}" ]] ; then
+            swiftpm_bootstrap_command+=(
+                --xctest="${XCTEST_BUILD_DIR}")
+        fi
     fi
 }