Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion Sources/SwiftDriver/Jobs/Planning.swift
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,8 @@ extension Driver {
resourceDirPath: resourceDirPath,
requiresInPlaceExecution: true,
useStaticResourceDir: useStaticResourceDir,
swiftCompilerPrefixArgs: swiftCompilerPrefixArgs)
swiftCompilerPrefixArgs: swiftCompilerPrefixArgs,
isEmbedded: parsedOptions.isEmbeddedEnabled)
}

if parsedOptions.hasArgument(.printSupportedFeatures) {
Expand Down
11 changes: 10 additions & 1 deletion Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@ extension Toolchain {
runtimeCompatibilityVersion: String? = nil,
requiresInPlaceExecution: Bool = false,
useStaticResourceDir: Bool = false,
swiftCompilerPrefixArgs: [String]) throws -> Job {
swiftCompilerPrefixArgs: [String],
isEmbedded: Bool = false
) throws -> Job {
var commandLine: [Job.ArgTemplate] = swiftCompilerPrefixArgs.map { Job.ArgTemplate.flag($0) }
commandLine.append(contentsOf: [.flag("-frontend"),
.flag("-print-target-info")])
Expand Down Expand Up @@ -168,6 +170,13 @@ extension Toolchain {
commandLine += [.flag("-use-static-resource-dir")]
}

if isEmbedded {
commandLine += [
.flag("-enable-experimental-feature"),
.flag("Embedded")
]
}

return Job(
moduleName: "",
kind: .printTargetInfo,
Expand Down
15 changes: 15 additions & 0 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6949,6 +6949,21 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertFalse(linkJob.commandLine.joinedUnresolvedArguments.contains("swiftrt.o"))
}

// Printing target info needs to pass through the experimental flag.
do {
var driver = try Driver(args: [
"swiftc",
"-target",
"aarch64-none-none-elf",
"-enable-experimental-feature", "Embedded",
"-print-target-info"
], env: env)

let jobs = try driver.planBuild()
let targetInfoJob = try jobs.findJob(.printTargetInfo)
XCTAssertTrue(targetInfoJob.commandLine.contains(.flag("Embedded")))
}

// Embedded Wasm compile job
do {
var driver = try Driver(args: ["swiftc", "-target", "wasm32-none-none-wasm", "test.swift", "-enable-experimental-feature", "Embedded", "-wmo", "-o", "a.wasm"], env: env)
Expand Down