diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2022-06-25 10:50:00 +0200 |
|---|---|---|
| committer | Jakub Konka <kubkon@jakubkonka.com> | 2022-06-25 10:50:00 +0200 |
| commit | dfdb807543a03eec27341deec6a5f3b88f87fac3 (patch) | |
| tree | 7a5722c848921314e3ff464ea703bab6fc037db9 /src/link | |
| parent | 24821dd17f3a23d9fb496ff8fa5dcbefb5b1d18d (diff) | |
| download | zig-dfdb807543a03eec27341deec6a5f3b88f87fac3.tar.gz zig-dfdb807543a03eec27341deec6a5f3b88f87fac3.zip | |
cache setting macho search strategy flags
Diffstat (limited to 'src/link')
| -rw-r--r-- | src/link/Coff.zig | 2 | ||||
| -rw-r--r-- | src/link/Elf.zig | 2 | ||||
| -rw-r--r-- | src/link/MachO.zig | 3 | ||||
| -rw-r--r-- | src/link/Wasm.zig | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/link/Coff.zig b/src/link/Coff.zig index 6b4ff26bce..3418a206df 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -969,7 +969,7 @@ fn linkWithLLD(self: *Coff, comp: *Compilation, prog_node: *std.Progress.Node) ! man = comp.cache_parent.obtain(); self.base.releaseLock(); - comptime assert(Compilation.link_hash_implementation_version == 4); + comptime assert(Compilation.link_hash_implementation_version == 5); for (self.base.options.objects) |obj| { _ = try man.addFile(obj.path, null); diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 0bcde06f33..1051c0eb78 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -1298,7 +1298,7 @@ fn linkWithLLD(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node) !v // We are about to obtain this lock, so here we give other processes a chance first. self.base.releaseLock(); - comptime assert(Compilation.link_hash_implementation_version == 4); + comptime assert(Compilation.link_hash_implementation_version == 5); try man.addOptionalFile(self.base.options.linker_script); try man.addOptionalFile(self.base.options.version_script); diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 92d8134ec9..2bbd2e7a72 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -541,7 +541,7 @@ pub fn flushModule(self: *MachO, comp: *Compilation, prog_node: *std.Progress.No // We are about to obtain this lock, so here we give other processes a chance first. self.base.releaseLock(); - comptime assert(Compilation.link_hash_implementation_version == 4); + comptime assert(Compilation.link_hash_implementation_version == 5); for (self.base.options.objects) |obj| { _ = try man.addFile(obj.path, null); @@ -555,6 +555,7 @@ pub fn flushModule(self: *MachO, comp: *Compilation, prog_node: *std.Progress.No // installation sources because they are always a product of the compiler version + target information. man.hash.add(stack_size); man.hash.addOptional(self.base.options.pagezero_size); + man.hash.addOptional(self.base.options.search_strategy); man.hash.addListOfBytes(self.base.options.lib_dirs); man.hash.addListOfBytes(self.base.options.framework_dirs); man.hash.addListOfBytes(self.base.options.frameworks); diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig index 4357a588a1..c654fbe719 100644 --- a/src/link/Wasm.zig +++ b/src/link/Wasm.zig @@ -2481,7 +2481,7 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation, prog_node: *std.Progress.Node) ! // We are about to obtain this lock, so here we give other processes a chance first. self.base.releaseLock(); - comptime assert(Compilation.link_hash_implementation_version == 4); + comptime assert(Compilation.link_hash_implementation_version == 5); for (self.base.options.objects) |obj| { _ = try man.addFile(obj.path, null); |