From e8edc4cf831229f9acfa07001f385bac7fec89b0 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 29 Aug 2022 14:52:18 -0700 Subject: [PATCH] link: add force_undefined_symbols to cache hash Follow-up for d5233ee85ce13cba3dd03e4c0c938cee193b9b19. --- src/Compilation.zig | 1 + src/link/Coff.zig | 1 + src/link/Elf.zig | 1 + 3 files changed, 3 insertions(+) diff --git a/src/Compilation.zig b/src/Compilation.zig index 353a2f1ca3..32d06e5907 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -2516,6 +2516,7 @@ fn addNonIncrementalStuffToCacheManifest(comp: *Compilation, man: *Cache.Manifes man.hash.addOptionalBytes(comp.bin_file.options.soname); man.hash.addOptional(comp.bin_file.options.version); link.hashAddSystemLibs(&man.hash, comp.bin_file.options.system_libs); + man.hash.addListOfBytes(comp.bin_file.options.force_undefined_symbols.keys()); man.hash.addOptional(comp.bin_file.options.allow_shlib_undefined); man.hash.add(comp.bin_file.options.bind_global_refs_locally); man.hash.add(comp.bin_file.options.tsan); diff --git a/src/link/Coff.zig b/src/link/Coff.zig index c30544d3b7..e4f0227aec 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -1032,6 +1032,7 @@ fn linkWithLLD(self: *Coff, comp: *Compilation, prog_node: *std.Progress.Node) ! } } link.hashAddSystemLibs(&man.hash, self.base.options.system_libs); + man.hash.addListOfBytes(self.base.options.force_undefined_symbols.keys()); man.hash.addOptional(self.base.options.subsystem); man.hash.add(self.base.options.is_test); man.hash.add(self.base.options.tsaware); diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 293771dd2a..e63fa07187 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -1349,6 +1349,7 @@ fn linkWithLLD(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node) !v man.hash.addOptionalBytes(self.base.options.soname); man.hash.addOptional(self.base.options.version); link.hashAddSystemLibs(&man.hash, self.base.options.system_libs); + man.hash.addListOfBytes(self.base.options.force_undefined_symbols.keys()); man.hash.add(allow_shlib_undefined); man.hash.add(self.base.options.bind_global_refs_locally); man.hash.add(self.base.options.compress_debug_sections);