Skip to content

Revert "more workarounds for nested swift-builds" #744

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

Open
ktoso wants to merge 1 commit into
base: main
Choose a base branch
from
+0 −26
Open

Revert "more workarounds for nested swift-builds" #744

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
13 changes: 0 additions & 13 deletions SwiftKitCore/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,19 +86,6 @@ val compileSwift = tasks.register<Exec>("compileSwift") {
commandLine("swift")
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
args("build", "--disable-experimental-prebuilts", "--target", "SwiftRuntimeFunctions")

// When this task runs inside an outer swift-build-driven invocation (e.g.
// JExtractSwiftPlugin -> java-callbacks-build -> gradle -> here) the outer
// build leaks Xcode-style build settings (SDKROOT=/, TOOLCHAINS, SDK_*,
// SWIFTC_PASS_*) into the subprocess environment, which breaks the nested
// swift build with "unable to resolve run destination SDK: '/'". Strip
// them so the inner invocation resolves its own defaults.
listOf(
"SDKROOT", "SDK_DIR", "SDK_DIR_linux", "SDK_NAME", "SDK_NAMES",
"SDK_VERSION", "SDK_VERSION_ACTUAL", "SDK_VERSION_MAJOR", "SDK_VERSION_MINOR",
"SDK_STAT_CACHE_DIR", "SDK_STAT_CACHE_ENABLE", "SDK_STAT_CACHE_PATH",
"SWIFTC_PASS_SDKROOT", "SWIFTC_PASS_SYSROOT", "TOOLCHAINS",
).forEach { environment.remove(it) }
}
tasks.build {
dependsOn(compileSwift)
Expand Down
13 changes: 0 additions & 13 deletions SwiftKitFFM/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,19 +89,6 @@ val compileSwift = tasks.register<Exec>("compileSwift") {
commandLine("swift")
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
args("build", "--disable-experimental-prebuilts", "--target", "SwiftRuntimeFunctions")

// When this task runs inside an outer swift-build-driven invocation (e.g.
// JExtractSwiftPlugin -> java-callbacks-build -> gradle -> here) the outer
// build leaks Xcode-style build settings (SDKROOT=/, TOOLCHAINS, SDK_*,
// SWIFTC_PASS_*) into the subprocess environment, which breaks the nested
// swift build with "unable to resolve run destination SDK: '/'". Strip
// them so the inner invocation resolves its own defaults.
listOf(
"SDKROOT", "SDK_DIR", "SDK_DIR_linux", "SDK_NAME", "SDK_NAMES",
"SDK_VERSION", "SDK_VERSION_ACTUAL", "SDK_VERSION_MAJOR", "SDK_VERSION_MINOR",
"SDK_STAT_CACHE_DIR", "SDK_STAT_CACHE_ENABLE", "SDK_STAT_CACHE_PATH",
"SWIFTC_PASS_SDKROOT", "SWIFTC_PASS_SYSROOT", "TOOLCHAINS",
).forEach { environment.remove(it) }
}
tasks.build {
dependsOn(compileSwift)
Expand Down
Loading