fixup

Author: tomerd

Utilities/Docker/Dockerfile

@@ -20,13 +20,14 @@ ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US.UTF-8
 
-# SwiftPM dependencies
+# SwiftPM dependancies
 #---------------------
 
 RUN apt-get update && apt-get install -y \
   sqlite3 \
   libsqlite3-dev \
-  libncurses5-dev
+  libncurses5-dev \
+  zip
 
 # Bootstrap script dependencies
 #------------------------------

Utilities/Docker/docker-compose.yaml

@@ -39,6 +39,8 @@ services:
       - ../../../swift-driver:/code/swift-driver:z
       - ../../../swift-crypto:/code/swift-crypto:z
       - ../../../swift-llbuild:/code/llbuild:z
+      - ../../../swift-system:/code/swift-system:z
+      - ../../../swift-collections:/code/swift-collections:z
     working_dir: /code/swift-package-manager
     cap_drop:
       - CAP_NET_RAW

Utilities/bootstrap

@@ -616,6 +616,10 @@ def build_swiftpm_with_swiftpm(args, integrated_swift_driver):
     if integrated_swift_driver:
         swiftpm_args.append("--use-integrated-swift-driver")
 
+
+    # tools distributed in the toolchain should not statically link the swift runtime
+    swiftpm_args.append("--disable-static-swift-runtime")
+
     # Build SwiftPM, including libSwiftPM, all the command line tools, and the current variant of PackageDescription.
     call_swiftpm(args, swiftpm_args)