Skip to content

Commit

Permalink
Fixes build error when using Xcode 14.3
Browse files Browse the repository at this point in the history
- Xcode 14.3 has added some SDKs (such as AssetRuntime.iOS16.4.sdk) that have broken Buck's code for retrieving configurations from the Xcode SDK.
  • Loading branch information
vulh3 committed Apr 4, 2023
1 parent 9ed1a36 commit e665e5a
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions src/com/facebook/buck/apple/toolchain/impl/AppleSdkDiscovery.java
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,20 @@ public static ImmutableMap<AppleSdk, AppleSdkPaths> discoverAppleSdkPaths(
}

AppleSdk.Builder sdkBuilder = AppleSdk.builder();
if (buildSdkFromPath(
sdkDir, sdkBuilder, xcodeToolchains, defaultToolchain, appleConfig)) {
Boolean built = false;
try {
built = buildSdkFromPath(
sdkDir,
sdkBuilder,
xcodeToolchains,
defaultToolchain,
appleConfig
);
} catch (Exception e) {
built = false;
}

if (built) {
AppleSdk sdk = sdkBuilder.build();
LOG.debug("Found SDK %s", sdk);

Expand Down

0 comments on commit e665e5a

Please sign in to comment.