diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d2bb4d8949a4a..6ae8160618f0e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,61 +47,61 @@ jobs:
 #          name: linux-test-results
 #          path: ./swift-test-results.tar.gz
 
-  macos_build:
-    timeout-minutes: 0
-    runs-on: macos-latest
+#   macos_build:
+#     timeout-minutes: 0
+#     runs-on: macos-latest
 
-    steps:
-      - uses: actions/checkout@v1
-        with:
-          path: swift
-      - uses: actions/cache@v1
-        with:
-          path: ../build-cache
-          key: ${{ runner.os }}-sccache-v4
-      - name: Build macOS installable archive
-        run: ./utils/webassembly/ci.sh
-      - name: Upload macOS installable archive
-        uses: actions/upload-artifact@v1
-        with:
-          name: macos-installable
-          path: ../swift-wasm-DEVELOPMENT-SNAPSHOT-osx.tar.gz
-      - name: Upload packaging scripts
-        uses: actions/upload-artifact@v1
-        with:
-          name: packaging-scripts
-          path: utils/webassembly
-      - name: Pack test results
-        run: tar cJf swift-test-results.tar.gz ../build/*/swift-macosx-x86_64/swift-test-results
-      - name: Upload test results
-        uses: actions/upload-artifact@v1
-        with:
-          name: macos-test-results
-          path: ./swift-test-results.tar.gz
-  macos_smoke_test:
-    name: Compile hello.swift on macOS
-    runs-on: macos-latest
-    needs: macos_build
-    steps:
-      - name: Download installable macOS archive
-        uses: actions/download-artifact@v1
-        with:
-          name: macos-installable
-      - name: Build hello.wasm
-        shell: bash
-        run: |
-          set -x
-          tar xf $(find . -name "swift-wasm-*.tar.gz" -type f)
-          TOOLCHAIN_PATH=$(find . -name "swift-wasm-*" -type d)
-          echo 'print("Hello, world!")' > hello.swift
-          $TOOLCHAIN_PATH/usr/bin/swiftc \
-                -target wasm32-unknown-wasi \
-                -sdk $TOOLCHAIN_PATH/usr/share/wasi-sysroot \
-                hello.swift -o hello.wasm && \
-                echo "Successfully linked hello.wasm"
+#     steps:
+#       - uses: actions/checkout@v1
+#         with:
+#           path: swift
+#       - uses: actions/cache@v1
+#         with:
+#           path: ../build-cache
+#           key: ${{ runner.os }}-sccache-v4
+#       - name: Build macOS installable archive
+#         run: ./utils/webassembly/ci.sh
+#       - name: Upload macOS installable archive
+#         uses: actions/upload-artifact@v1
+#         with:
+#           name: macos-installable
+#           path: ../swift-wasm-DEVELOPMENT-SNAPSHOT-osx.tar.gz
+#       - name: Upload packaging scripts
+#         uses: actions/upload-artifact@v1
+#         with:
+#           name: packaging-scripts
+#           path: utils/webassembly
+#       - name: Pack test results
+#         run: tar cJf swift-test-results.tar.gz ../build/*/swift-macosx-x86_64/swift-test-results
+#       - name: Upload test results
+#         uses: actions/upload-artifact@v1
+#         with:
+#           name: macos-test-results
+#           path: ./swift-test-results.tar.gz
+#   macos_smoke_test:
+#     name: Compile hello.swift on macOS
+#     runs-on: macos-latest
+#     needs: macos_build
+#     steps:
+#       - name: Download installable macOS archive
+#         uses: actions/download-artifact@v1
+#         with:
+#           name: macos-installable
+#       - name: Build hello.wasm
+#         shell: bash
+#         run: |
+#           set -x
+#           tar xf $(find . -name "swift-wasm-*.tar.gz" -type f)
+#           TOOLCHAIN_PATH=$(find . -name "swift-wasm-*" -type d)
+#           echo 'print("Hello, world!")' > hello.swift
+#           $TOOLCHAIN_PATH/usr/bin/swiftc \
+#                 -target wasm32-unknown-wasi \
+#                 -sdk $TOOLCHAIN_PATH/usr/share/wasi-sysroot \
+#                 hello.swift -o hello.wasm && \
+#                 echo "Successfully linked hello.wasm"
 
-      - name: Upload hello.wasm compiled with macOS package
-        uses: actions/upload-artifact@v1
-        with:
-          name: macos-hello.wasm
-          path: hello.wasm
+#       - name: Upload hello.wasm compiled with macOS package
+#         uses: actions/upload-artifact@v1
+#         with:
+#           name: macos-hello.wasm
+#           path: hello.wasm
diff --git a/utils/build-script b/utils/build-script
index 9aed8be4f613d..88b3547631788 100755
--- a/utils/build-script
+++ b/utils/build-script
@@ -308,7 +308,7 @@ def apply_default_arguments(toolchain, args):
     # On OS X, libdispatch is provided by the OS.
     # On Linux, we must ensure that it is built manually.
     if (args.build_foundation and
-            platform.system() != "Darwin"):
+            platform.system() != "Darwin" and not args.wasm):
         args.build_libdispatch = True
 
     if args.build_subdir is None:
diff --git a/utils/update_checkout/update-checkout-config.json b/utils/update_checkout/update-checkout-config.json
index d88d829105b74..aeae979549cd9 100644
--- a/utils/update_checkout/update-checkout-config.json
+++ b/utils/update_checkout/update-checkout-config.json
@@ -19,7 +19,7 @@
         "swift-corelibs-xctest": {
             "remote": { "id": "apple/swift-corelibs-xctest" } },
         "swift-corelibs-foundation": {
-            "remote": { "id": "apple/swift-corelibs-foundation" } },
+            "remote": { "id": "swiftwasm/swift-corelibs-foundation" } },
         "swift-corelibs-libdispatch": {
             "remote": { "id": "apple/swift-corelibs-libdispatch" } },
         "swift-integration-tests": {
@@ -63,7 +63,7 @@
                 "swift-syntax": "master",
                 "swift-stress-tester": "master",
                 "swift-corelibs-xctest": "master",
-                "swift-corelibs-foundation": "master",
+                "swift-corelibs-foundation": "swiftwasm",
                 "swift-corelibs-libdispatch": "master",
                 "swift-integration-tests": "master",
                 "swift-xcode-playground-support": "master",
diff --git a/utils/webassembly/build-linux.sh b/utils/webassembly/build-linux.sh
index 9050c2bed100a..0cedc7c07e0f7 100755
--- a/utils/webassembly/build-linux.sh
+++ b/utils/webassembly/build-linux.sh
@@ -5,6 +5,7 @@ SWIFT_PATH=$SOURCE_PATH/swift
 
 $SWIFT_PATH/utils/build-script --wasm \
   --skip-build-benchmarks \
+  --libdispatch true \
   --extra-cmake-options=" \
     -DSWIFT_PRIMARY_VARIANT_SDK:STRING=WASI \
     -DSWIFT_PRIMARY_VARIANT_ARCH:STRING=wasm32 \
diff --git a/utils/webassembly/linux/install-dependencies.sh b/utils/webassembly/linux/install-dependencies.sh
index edb8bc3daa262..728c700872d0d 100755
--- a/utils/webassembly/linux/install-dependencies.sh
+++ b/utils/webassembly/linux/install-dependencies.sh
@@ -2,6 +2,11 @@
 
 set -ex
 
+dpkg -l | grep gcc
+dpkg -l | grep libc
+dpkg -l | grep libstdc
+
+sudo apt-get purge libgcc-9-dev gcc-9 
 sudo apt update
 sudo apt install -y \
   git ninja-build clang python python-six \