diff options
| author | Jacob Young <15544577+jacobly0@users.noreply.github.com> | 2025-10-30 12:09:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-30 12:09:13 -0400 |
| commit | 5b060ef9d4acab0a92891e83d354f1c8e8e658e5 (patch) | |
| tree | 719022194a5bca2d7c2392ca1a3fb3de9ff926bb /lib/std/Build/Module.zig | |
| parent | 4174ab9c2c98d798452dd745d5d5dc657d601591 (diff) | |
| parent | 0834e696f75d8477e5bc7a2dc49e7d10800039bc (diff) | |
| download | zig-5b060ef9d4acab0a92891e83d354f1c8e8e658e5.tar.gz zig-5b060ef9d4acab0a92891e83d354f1c8e8e658e5.zip | |
Merge pull request #25558 from jacobly0/elfv2-load-obj
Elf2: start implementing input object loading
Diffstat (limited to 'lib/std/Build/Module.zig')
| -rw-r--r-- | lib/std/Build/Module.zig | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/std/Build/Module.zig b/lib/std/Build/Module.zig index 2719aea1c6..657f8bb74e 100644 --- a/lib/std/Build/Module.zig +++ b/lib/std/Build/Module.zig @@ -596,10 +596,13 @@ pub fn appendZigProcessFlags( "-target", try target.query.zigTriple(b.allocator), "-mcpu", try target.query.serializeCpuAlloc(b.allocator), }); - - if (target.query.dynamic_linker.get()) |dynamic_linker| { - try zig_args.append("--dynamic-linker"); - try zig_args.append(dynamic_linker); + if (target.query.dynamic_linker) |dynamic_linker| { + if (dynamic_linker.get()) |dynamic_linker_path| { + try zig_args.append("--dynamic-linker"); + try zig_args.append(dynamic_linker_path); + } else { + try zig_args.append("--no-dynamic-linker"); + } } } } |