Skip to content

EmscriptenToolchain: clean up comments and linkerOutputType handling #2136

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

EmscriptenToolchain: clean up comments and linkerOutputType handling #2136

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
8 changes: 4 additions & 4 deletions Sources/SwiftDriver/Jobs/EmscriptenToolchain+LinkerSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@ extension EmscriptenToolchain {
parsedOptions: &parsedOptions,
sanitizers: sanitizers,
lto: lto,
targetInfo: targetInfo,
linkerOutputType: linkerOutputType
targetInfo: targetInfo
)

// `emcc` supports `-Xlinker` for passing flags to `wasm-ld`, but
// `-Xclang-linker` is `clang`-specific and must not be forwarded.
// `emcc` supports `-Xlinker` for passing flags to `wasm-ld`. `-Xclang-linker`
// is intentionally not forwarded here; `EmscriptenToolchain.validateArgs`
// emits a warning at parse time directing users to `-Xemcc-linker` instead.
for linkerOpt in parsedOptions.arguments(for: .Xlinker) {
commandLine.appendFlag(.Xlinker)
commandLine.appendFlag(linkerOpt.argument.asSingle)
Expand Down
3 changes: 1 addition & 2 deletions Sources/SwiftDriver/Jobs/WASIToolchain+LinkerSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,7 @@ extension WASIToolchain {
parsedOptions: &parsedOptions,
sanitizers: sanitizers,
lto: lto,
targetInfo: targetInfo,
linkerOutputType: linkerOutputType
targetInfo: targetInfo
)

try addExtraClangLinkerArgs(to: &commandLine, parsedOptions: &parsedOptions)
Expand Down
5 changes: 2 additions & 3 deletions Sources/SwiftDriver/Jobs/WebAssemblyToolchainProtocol+LinkerSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,13 @@ extension WebAssemblyToolchainProtocol {
parsedOptions: inout ParsedOptions,
sanitizers: Set<Sanitizer>,
lto: LTOKind?,
targetInfo: FrontendTargetInfo,
linkerOutputType: LinkOutputType
targetInfo: FrontendTargetInfo
) throws {
let targetTriple = targetInfo.target.triple

// Delegate to Clang for sanitizers. It will figure out the correct linker
// options.
if linkerOutputType == .executable && !sanitizers.isEmpty {
if !sanitizers.isEmpty {
let sanitizerNames = sanitizers
.map { $0.rawValue }
.sorted() // Sort so we get a stable, testable order
Expand Down
Loading