diff options
Diffstat (limited to 'src/task_ld.cc')
| -rw-r--r-- | src/task_ld.cc | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/src/task_ld.cc b/src/task_ld.cc index 03745be..35c40ce 100644 --- a/src/task_ld.cc +++ b/src/task_ld.cc @@ -115,6 +115,7 @@ int TaskLD::runInner() } append(args, ld_option(toolchain, ctor::ld_opt::output, targetFile().string())); + append(args, to_strings(toolchain, {ctor::toolchain::msvc, ctor::ld_opt::custom, "/nologo"})); { // Write flags to file. std::ofstream flagsStream(flagsFile); @@ -129,11 +130,33 @@ int TaskLD::runInner() auto tool = compiler(); const auto& cfg = ctor::get_configuration(); - auto ldflags = cfg.getenv("LDFLAGS"); - if(!ldflags.empty()) + switch(toolchain) { - append(args, ld_option(toolchain, ctor::ld_opt::custom, ldflags)); + case ctor::toolchain::msvc: + switch(outputSystem()) + { + case ctor::output_system::host: + tool = cfg.get(ctor::cfg::host_ld, "link.exe"); + break; + case ctor::output_system::build: + tool = cfg.get(ctor::cfg::build_ld, "link.exe"); + break; + } + break; + case ctor::toolchain::gcc: + case ctor::toolchain::clang: + case ctor::toolchain::any: + case ctor::toolchain::none: + { + auto ldflags = cfg.getenv("LDFLAGS"); + if(!ldflags.empty()) + { + append(args, ld_option(toolchain, ctor::ld_opt::custom, ldflags)); + } + } + break; } + auto res = execute(settings, tool, args, cfg.env, is_self); if(res != 0) { |