Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.

Commit b3b2934

Browse files
pomozoffAnton Pomozov
andauthored
Fix building with Xcode 12.5 (#2622)
* Fix building in Xcode 12.4+ * Update libswiftCompatibility from 50 to 51 Co-authored-by: Anton Pomozov <anton.pomozov@ooma.com>
1 parent ddf2941 commit b3b2934

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/com/facebook/buck/features/apple/project/ProjectGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2549,7 +2549,7 @@ private ImmutableMap<String, String> getFrameworkAndLibrarySearchPathConfigs(
25492549

25502550
librarySearchPaths.add("$DT_TOOLCHAIN_DIR/usr/lib/swift/$PLATFORM_NAME");
25512551
if (options.shouldLinkSystemSwift()) {
2552-
librarySearchPaths.add("$DT_TOOLCHAIN_DIR/usr/lib/swift-5.0/$PLATFORM_NAME");
2552+
librarySearchPaths.add("$DT_TOOLCHAIN_DIR/usr/lib/swift-5.2/$PLATFORM_NAME");
25532553
}
25542554
}
25552555

src/com/facebook/buck/features/apple/projectV2/XcodeNativeTargetGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1863,7 +1863,7 @@ private ImmutableMap<String, String> getFrameworkAndLibrarySearchPathConfigs(
18631863
// folder changes in a future release this can be revisited.
18641864
librarySearchPaths.add("$DT_TOOLCHAIN_DIR/usr/lib/swift/$PLATFORM_NAME");
18651865
if (options.shouldLinkSystemSwift()) {
1866-
librarySearchPaths.add("$DT_TOOLCHAIN_DIR/usr/lib/swift-5.0/$PLATFORM_NAME");
1866+
librarySearchPaths.add("$DT_TOOLCHAIN_DIR/usr/lib/swift-5.2/$PLATFORM_NAME");
18671867
}
18681868
}
18691869

src/com/facebook/buck/swift/toolchain/impl/SwiftPlatformFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ public static Optional<Path> findSwiftCompatibilityRuntimePath(
139139
}
140140

141141
// Currently Xcode includes swift and swift-5.0 directories, and each contains different
142-
// contents. Specifically, swift/platform contains the libswiftCompatibility50 and
142+
// contents. Specifically, swift/platform contains the libswiftCompatibility51 and
143143
// libswiftCompatibilityDynamicReplacements libraries which are *also* necessary.
144144
Path swiftRuntimePath = toolchainPath.resolve("usr/lib/swift").resolve(platformName);
145-
String libSwiftCompatibilityLibraryName = "libswiftCompatibility50.a";
145+
String libSwiftCompatibilityLibraryName = "libswiftCompatibility51.a";
146146
LOG.debug("Searching for swift compatibility toolchain in %s", toolchainPath.toString());
147147
if (Files.exists(swiftRuntimePath.resolve(libSwiftCompatibilityLibraryName))) {
148148
LOG.debug("Found swift compatibility toolchain at %s", toolchainPath.toString());

0 commit comments

Comments
 (0)