From 1cda0f7cb42ea8128d08cd3020a534187692f9d2 Mon Sep 17 00:00:00 2001 From: Konrad Malawski Date: Thu, 14 May 2026 13:47:51 +0900 Subject: [PATCH] Revert "more workarounds for nested swift-builds" This reverts commit 06947f18f77827835a4a446f843d4a04a386e7bf. --- SwiftKitCore/build.gradle.kts | 13 ------------- SwiftKitFFM/build.gradle.kts | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/SwiftKitCore/build.gradle.kts b/SwiftKitCore/build.gradle.kts index 89d8f5c46..ec5dfd2ae 100644 --- a/SwiftKitCore/build.gradle.kts +++ b/SwiftKitCore/build.gradle.kts @@ -86,19 +86,6 @@ val compileSwift = tasks.register("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) diff --git a/SwiftKitFFM/build.gradle.kts b/SwiftKitFFM/build.gradle.kts index b9a913a5c..1659da750 100644 --- a/SwiftKitFFM/build.gradle.kts +++ b/SwiftKitFFM/build.gradle.kts @@ -89,19 +89,6 @@ val compileSwift = tasks.register("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)