diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2025-12-28 21:48:09 +0100 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2026-02-07 22:39:27 +0100 |
| commit | 43d51f8a6b6c1d221a335dfb67f3c679f7afb905 (patch) | |
| tree | bcb4cf32c56d8719dc52cc93f7c1381b0614a341 /src/task_ld.cc | |
| parent | c849d9bff18152e83d6e62aa11de2f14fe974488 (diff) | |
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 2dceb59..165e6ac 100644 --- a/src/task_ld.cc +++ b/src/task_ld.cc @@ -111,6 +111,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); @@ -125,11 +126,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) { |