diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2023-12-04 21:56:29 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2024-01-01 17:51:18 -0700 |
| commit | 77420af9d01b1932a583fdcbfa169f2eb2b7c221 (patch) | |
| tree | dfaec3c2eba04fe64c0f77e27ab423d1226ddbed /src/Compilation.zig | |
| parent | ce94c28e53e706e506d4c95c25c8bf99e7a597eb (diff) | |
| download | zig-77420af9d01b1932a583fdcbfa169f2eb2b7c221.tar.gz zig-77420af9d01b1932a583fdcbfa169f2eb2b7c221.zip | |
compiler: get the dynamic linker from the target
instead of passing it to Compilation separately and storing it
separately in the linker options.
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 0b275f97c1..4f65dc22f2 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -803,7 +803,6 @@ pub const InitOptions = struct { main_mod: ?*Package.Module, output_mode: std.builtin.OutputMode, thread_pool: *ThreadPool, - dynamic_linker: ?[]const u8 = null, sysroot: ?[]const u8 = null, /// `null` means to not emit a binary file. emit_bin: ?EmitLoc, @@ -1836,7 +1835,6 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation { .root_name = root_name, .module = module, .target = options.target, - .dynamic_linker = options.dynamic_linker, .sysroot = sysroot, .output_mode = options.output_mode, .link_mode = link_mode, @@ -2800,7 +2798,7 @@ fn addNonIncrementalStuffToCacheManifest(comp: *Compilation, man: *Cache.Manifes man.hash.addOptionalBytes(libc_installation.kernel32_lib_dir); } } - man.hash.addOptionalBytes(comp.bin_file.options.dynamic_linker); + man.hash.addOptionalBytes(target.dynamic_linker.get()); } man.hash.addOptionalBytes(comp.bin_file.options.soname); man.hash.addOptional(comp.bin_file.options.version); |