Skip to content

Don't rely on SystemPrefix to set IOS_UNZIPPERED_TWIN_PREFIX_PATH #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ian-twilightcoder merged 1 commit into from
Dec 4, 2025
Merged

Don't rely on SystemPrefix to set IOS_UNZIPPERED_TWIN_PREFIX_PATH #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Sources/SWBCore/Settings/BuiltinMacros.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ public final class BuiltinMacros {
public static let HOST_PLATFORM = BuiltinMacros.declareStringMacro("HOST_PLATFORM")
public static let IOS_UNZIPPERED_TWIN_PREFIX_PATH = BuiltinMacros.declareStringMacro("IOS_UNZIPPERED_TWIN_PREFIX_PATH")
public static let IPHONEOS_DEPLOYMENT_TARGET = BuiltinMacros.declareStringMacro("IPHONEOS_DEPLOYMENT_TARGET")
public static let MACOS_UNZIPPERED_TWIN_PREFIX_PATH = BuiltinMacros.declareStringMacro("MACOS_UNZIPPERED_TWIN_PREFIX_PATH")
public static let MACOSX_DEPLOYMENT_TARGET = BuiltinMacros.declareStringMacro("MACOSX_DEPLOYMENT_TARGET")
public static let NATIVE_ARCH = BuiltinMacros.declareStringMacro("NATIVE_ARCH")
public static let NATIVE_ARCH_32_BIT = BuiltinMacros.declareStringMacro("NATIVE_ARCH_32_BIT")
Expand Down Expand Up @@ -1993,6 +1994,7 @@ public final class BuiltinMacros {
MACOS_CREATOR_ARG,
MACOS_TYPE,
MACOS_TYPE_ARG,
MACOS_UNZIPPERED_TWIN_PREFIX_PATH,
MAC_OS_X_PRODUCT_BUILD_VERSION,
MAC_OS_X_VERSION_ACTUAL,
MAC_OS_X_VERSION_MAJOR,
Expand Down
10 changes: 5 additions & 5 deletions Sources/SWBCore/Settings/Settings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2524,6 +2524,11 @@ private class SettingsBuilder: ProjectMatchLookup {
platformTable.push(BuiltinMacros.PLATFORM_DEVELOPER_USR_DIR, Static { BuiltinMacros.namespace.parseString("$(DEVELOPER_USR_DIR)") })
platformTable.push(BuiltinMacros.PLATFORM_DEVELOPER_BIN_DIR, Static { BuiltinMacros.namespace.parseString("$(DEVELOPER_BIN_DIR)") })
platformTable.push(BuiltinMacros.PLATFORM_DEVELOPER_SDK_DIR, Static { BuiltinMacros.namespace.parseString("$(DEVELOPER_SDK_DIR)") })

// Set twin prefix paths in macOS for Mac Catalyst.
platformTable.push(BuiltinMacros.MACOS_UNZIPPERED_TWIN_PREFIX_PATH, literal: "")
platformTable.push(BuiltinMacros.IOS_UNZIPPERED_TWIN_PREFIX_PATH, literal: "/System/iOSSupport")

} else {
platformTable.push(BuiltinMacros.PLATFORM_DEVELOPER_APPLICATIONS_DIR, literal: "\(platform.path.str)/Developer/Applications")
platformTable.push(BuiltinMacros.PLATFORM_DEVELOPER_TOOLS_DIR, literal: "\(platform.path.str)/Developer/Tools")
Expand Down Expand Up @@ -2585,11 +2590,6 @@ private class SettingsBuilder: ProjectMatchLookup {
sdkTable.pushContentsOf(defaultSettingsTable)
}

// Set IOS_UNZIPPERED_TWIN_PREFIX_PATH to the Mac Catalyst variant's prefix path, even for the macOS variant.
if let macCatalystVariant = sdk.variant(for: MacCatalystInfo.sdkVariantName) {
sdkTable.push(BuiltinMacros.IOS_UNZIPPERED_TWIN_PREFIX_PATH, literal: macCatalystVariant.systemPrefix)
}

// Add the settings provided by the SDK variant, if there is one.
if let variant {
// Late-bound by `SDKRegistry.loadExtendedInfo` and may be nil if an error (which will have already been reported) was encountered during loading.
Expand Down
Loading