diff --git a/stdlib/toolchain/CompatibilitySpan/CMakeLists.txt b/stdlib/toolchain/CompatibilitySpan/CMakeLists.txt
index 06b90b2949b34..98a9a5940cee5 100644
--- a/stdlib/toolchain/CompatibilitySpan/CMakeLists.txt
+++ b/stdlib/toolchain/CompatibilitySpan/CMakeLists.txt
@@ -2,6 +2,13 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED SWIFT_STDLIB_LIBRARY_BUILD_TY
 
   set(library_name "swiftCompatibilitySpan")
 
+  # The correct fix would be to add this to the following to the invocation of add_swift_target_library
+  # DEPLOYMENT_VERSION_MACCATALYST ${COMPATIBILITY_MINIMUM_DEPLOYMENT_VERSION_MACCATALYST}
+  # but the underlying logic takes the deployment version from the cache instead
+  # so for now we override those values locally
+  set(SWIFT_DARWIN_DEPLOYMENT_VERSION_OSX "10.14.4")
+  set(SWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST "13.1")
+
   add_swift_target_library("${library_name}" ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
     FakeStdlib.swift
     ../../public/core/Span/MutableRawSpan.swift
@@ -13,8 +20,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED SWIFT_STDLIB_LIBRARY_BUILD_TY
 
     TARGET_SDKS ${SWIFT_APPLE_PLATFORMS}
 
-    LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
-
     SWIFT_COMPILE_FLAGS
       ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
       -parse-stdlib
@@ -28,7 +33,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND DEFINED SWIFT_STDLIB_LIBRARY_BUILD_TY
     DEPLOYMENT_VERSION_TVOS "12.2"
     DEPLOYMENT_VERSION_WATCHOS "5.2"
     DEPLOYMENT_VERSION_XROS "1.0"
-    DEPLOYMENT_VERSION_MACCATALYST "13.1"
 
     MACCATALYST_BUILD_FLAVOR "zippered"