From 51bebba309482d5e7d46a0fb341535011628ae8a Mon Sep 17 00:00:00 2001 From: Eric Miotto <1094986+edymtt@users.noreply.github.com> Date: Mon, 9 Nov 2020 15:32:48 +0000 Subject: [PATCH 1/2] Build libdispatch with its own module cache Some of the bots in CI run multiple jobs, so we need to be sure libdispatch compilations do not attempt to share the module cache. Addresses rdar://68100533 --- utils/build-script-impl | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/build-script-impl b/utils/build-script-impl index 185f6bf555092..92d0bded30040 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -2319,6 +2319,7 @@ for host in "${ALL_HOSTS[@]}"; do -DCMAKE_CXX_COMPILER:PATH="${CLANG_BIN}/clang++" -DCMAKE_SWIFT_COMPILER:PATH="${SWIFTC_BIN}" -DCMAKE_Swift_COMPILER:PATH="${SWIFTC_BIN}" + -DCMAKE_Swift_FLAGS:PATH="-module-cache-path \"${module_cache}\"" -DCMAKE_INSTALL_PREFIX:PATH="$(get_host_install_prefix ${host})" -DCMAKE_INSTALL_LIBDIR:PATH="lib" From 045211ce643506a3954f29b5b109e800b796c9ee Mon Sep 17 00:00:00 2001 From: Eric Miotto <1094986+edymtt@users.noreply.github.com> Date: Mon, 9 Nov 2020 13:15:32 -0800 Subject: [PATCH 2/2] Update flag type as per review feedback Co-authored-by: Mishal Shah --- utils/build-script-impl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build-script-impl b/utils/build-script-impl index 92d0bded30040..f7fd838905c88 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -2319,7 +2319,7 @@ for host in "${ALL_HOSTS[@]}"; do -DCMAKE_CXX_COMPILER:PATH="${CLANG_BIN}/clang++" -DCMAKE_SWIFT_COMPILER:PATH="${SWIFTC_BIN}" -DCMAKE_Swift_COMPILER:PATH="${SWIFTC_BIN}" - -DCMAKE_Swift_FLAGS:PATH="-module-cache-path \"${module_cache}\"" + -DCMAKE_Swift_FLAGS:STRING="-module-cache-path \"${module_cache}\"" -DCMAKE_INSTALL_PREFIX:PATH="$(get_host_install_prefix ${host})" -DCMAKE_INSTALL_LIBDIR:PATH="lib"