From e665e5a36f2408476442eae69c7fc4df0f2ac0ab Mon Sep 17 00:00:00 2001 From: vulh3 Date: Tue, 4 Apr 2023 10:06:14 +0700 Subject: [PATCH] Fixes build error when using Xcode 14.3 - 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. --- .../apple/toolchain/impl/AppleSdkDiscovery.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/com/facebook/buck/apple/toolchain/impl/AppleSdkDiscovery.java b/src/com/facebook/buck/apple/toolchain/impl/AppleSdkDiscovery.java index c2e53f81351..3b4e94a0723 100644 --- a/src/com/facebook/buck/apple/toolchain/impl/AppleSdkDiscovery.java +++ b/src/com/facebook/buck/apple/toolchain/impl/AppleSdkDiscovery.java @@ -133,8 +133,20 @@ public static ImmutableMap 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);