Fix building with Xcode 12.5 (facebook#2622)

* Fix building in Xcode 12.4+ * Update libswiftCompatibility from 50 to 51 Co-authored-by: Anton Pomozov <[email protected]>
milend · May 18, 2021 · b3b2934 · b3b2934
1 parent ddf2941
commit b3b2934
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/com/facebook/buck/features/apple/project/ProjectGenerator.java b/src/com/facebook/buck/features/apple/project/ProjectGenerator.java
@@ -2549,7 +2549,7 @@ private ImmutableMap<String, String> getFrameworkAndLibrarySearchPathConfigs(
 
       librarySearchPaths.add("$DT_TOOLCHAIN_DIR/usr/lib/swift/$PLATFORM_NAME");
       if (options.shouldLinkSystemSwift()) {
-        librarySearchPaths.add("$DT_TOOLCHAIN_DIR/usr/lib/swift-5.0/$PLATFORM_NAME");
+        librarySearchPaths.add("$DT_TOOLCHAIN_DIR/usr/lib/swift-5.2/$PLATFORM_NAME");
       }
     }
 

diff --git a/src/com/facebook/buck/features/apple/projectV2/XcodeNativeTargetGenerator.java b/src/com/facebook/buck/features/apple/projectV2/XcodeNativeTargetGenerator.java
@@ -1863,7 +1863,7 @@ private ImmutableMap<String, String> getFrameworkAndLibrarySearchPathConfigs(
       // folder changes in a future release this can be revisited.
       librarySearchPaths.add("$DT_TOOLCHAIN_DIR/usr/lib/swift/$PLATFORM_NAME");
       if (options.shouldLinkSystemSwift()) {
-        librarySearchPaths.add("$DT_TOOLCHAIN_DIR/usr/lib/swift-5.0/$PLATFORM_NAME");
+        librarySearchPaths.add("$DT_TOOLCHAIN_DIR/usr/lib/swift-5.2/$PLATFORM_NAME");
       }
     }
 

diff --git a/src/com/facebook/buck/swift/toolchain/impl/SwiftPlatformFactory.java b/src/com/facebook/buck/swift/toolchain/impl/SwiftPlatformFactory.java
@@ -139,10 +139,10 @@ public static Optional<Path> findSwiftCompatibilityRuntimePath(
     }
 
     // Currently Xcode includes swift and swift-5.0 directories, and each contains different
-    // contents. Specifically, swift/platform contains the libswiftCompatibility50 and
+    // contents. Specifically, swift/platform contains the libswiftCompatibility51 and
     // libswiftCompatibilityDynamicReplacements libraries which are *also* necessary.
     Path swiftRuntimePath = toolchainPath.resolve("usr/lib/swift").resolve(platformName);
-    String libSwiftCompatibilityLibraryName = "libswiftCompatibility50.a";
+    String libSwiftCompatibilityLibraryName = "libswiftCompatibility51.a";
     LOG.debug("Searching for swift compatibility toolchain in %s", toolchainPath.toString());
     if (Files.exists(swiftRuntimePath.resolve(libSwiftCompatibilityLibraryName))) {
       LOG.debug("Found swift compatibility toolchain at %s", toolchainPath.toString());