Skip to content

armgit / xtool

Public Imported from GitHub
0

Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.

sdk: update darwin-tools and OAM (#270)

Kabir Oberai916cdffba86c
diff --git a/Sources/PackLib/BuildSettings.swift b/Sources/PackLib/BuildSettings.swift
index 8d1a4a5..fbab09a 100644
--- a/Sources/PackLib/BuildSettings.swift
+++ b/Sources/PackLib/BuildSettings.swift
@@ -65,6 +65,8 @@ public struct BuildSettings: Sendable {
]
self.sdkEnvironment.merge([
"XCODE_EXTRA_PLATFORM_FOLDERS": "\(darwinSDK.bundle.path)/Developer/Platforms",
+ // SWB looks for dsymutil in the PATH. Other stuff (lld, libtool) is handled by toolset-swb.json.
+ "PATH": "\(darwinSDK.bundle.path)/toolset/bin:\(ProcessInfo.processInfo.environment["PATH"] ?? "")",
]) { $1 }
#endif
}
diff --git a/Sources/XToolSupport/SDKBuilder.swift b/Sources/XToolSupport/SDKBuilder.swift
index 15b0588..1826fc1 100644
--- a/Sources/XToolSupport/SDKBuilder.swift
+++ b/Sources/XToolSupport/SDKBuilder.swift
@@ -79,11 +79,12 @@ struct SDKBuilder {
static let sdkEpoch = 2
// tag from https://github.com/xtool-org/darwin-tools-linux-llvm
- static let darwinToolsVersion = "1.0.1"
+ static let darwinToolsVersion = "1.1.0"
// tag from https://github.com/xtool-org/OpenAppleMacros
- static let oamVersion = "1.2.0"
+ static let oamVersion = "1.3.0"
static let oamLibraries: [String] = [
+ "FoundationModelsMacros",
"PreviewsMacros",
"SwiftUIMacros",
]