mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-04 09:00:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support external wasm-ld linker for WebAssembly targets

Browse source 
Overridable with `-linker`.
This commit is contained in:
Martin Kinkelin 2018-12-22 18:14:10 +01:00
parent 44877222d4
commit c7b17368c3
4 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
driver/linker-gcc.cpp
View file

@ -703,16 +703,28 @@ int linkObjToBinaryGcc(llvm::StringRef outputPath,
}
#endif
// find gcc for linking
const std::string tool = getGcc();
// build command-line for gcc-compatible linker driver
// exception: invoke (ld-compatible) linker directly for WebAssembly targets
std::string tool;
std::unique_ptr<ArgsBuilder> argsBuilder;
#if LDC_LLVM_VER >= 500
if (global.params.targetTriple->isOSBinFormatWasm()) {
tool = getProgram("wasm-ld", &opts::linker);
argsBuilder = llvm::make_unique<LdArgsBuilder>();
} else {
#endif
tool = getGcc();
argsBuilder = llvm::make_unique<ArgsBuilder>();
#if LDC_LLVM_VER >= 500
}
#endif
// build arguments
ArgsBuilder argsBuilder;
argsBuilder.build(outputPath, defaultLibNames);
argsBuilder->build(outputPath, defaultLibNames);
Logger::println("Linking with: ");
Stream logstr = Logger::cout();
for (const auto &arg : argsBuilder.args) {
for (const auto &arg : argsBuilder->args) {
if (!arg.empty()) {
logstr << "'" << arg << "' ";
}
@ -720,5 +732,5 @@ int linkObjToBinaryGcc(llvm::StringRef outputPath,
logstr << "\n"; // FIXME where's flush ?
// try to call linker
return executeToolAndWait(tool, argsBuilder.args, global.params.verbose);
return executeToolAndWait(tool, argsBuilder->args, global.params.verbose);
}