Skip to content

Preserve Android deployment target in Swift module filenames #1534

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
somiljain2006 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Preserve Android deployment target in Swift module filenames #1534

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: 11 additions & 2 deletions Sources/SWBCore/SpecImplementations/Tools/SwiftCompiler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,9 +879,9 @@ public final class SwiftCompilerSpec : CompilerSpec, SpecIdentifierType, SwiftDi
func destinationModuleFileName(_ triple: LLVMTriple) -> String {
switch self {
case .generateModule(let moduleTriple, _):
return moduleTriple.unversioned.description
return moduleTriple.moduleFileNameDescription
default:
return triple.unversioned.description
return triple.moduleFileNameDescription
}
}

Expand Down Expand Up @@ -3746,6 +3746,15 @@ extension SwiftDiscoveredCommandLineToolSpecInfo {
}
}

extension LLVMTriple {
@_spi(Testing) public var moduleFileNameDescription: String {
if system == "linux" && environment?.hasPrefix("android") == true {
return description
}
return unversioned.description
}
}

#if canImport(Darwin) && canImport(os.log)
let previewsLogger = Logger(subsystem: "com.apple.dt.Previews", category: "swift-build")
#endif
Expand Down
11 changes: 11 additions & 0 deletions Tests/SWBCoreTests/SwiftCompilerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,4 +698,15 @@ fileprivate final class TestSwiftParserDelegate: TaskOutputParserDelegate, Senda
Path("/path/to/b.dia")])
}
}

@Test
func destinationModuleFileNameTriples() throws {
let androidTriple = try LLVMTriple("aarch64-unknown-linux-android28.0.0")
let appleTriple = try LLVMTriple("arm64-apple-ios15.0")
let linuxTriple = try LLVMTriple("x86_64-unknown-linux-gnu")

#expect(androidTriple.moduleFileNameDescription == "aarch64-unknown-linux-android28.0.0")
#expect(appleTriple.moduleFileNameDescription == "arm64-apple-ios")
#expect(linuxTriple.moduleFileNameDescription == "x86_64-unknown-linux-gnu")
}
}