authorgravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2025-06-08 23:14:42+01:00
committergravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2025-06-12 17:51:29+01:00
loga3abaaee0c1fa9a9d9d2ee47459e9b6ebb1938fa
tree08b3ac943522cf7576167a555ca88aad0e66a530
parent89a6c732e5dcf82fb0cdd18f268b8d0c908b12e8
signaturelock-open Commit is signed but in an unrecognized format.

test-link: correct expected object file name

The name of the ZCU object file emitted by the LLVM backend has been changed in this branch from e.g. `foo.o` to `foo_zcu.o`. This is to avoid name clashes. This commit just updates a link test which started failing because the object name in a linker error changed.

1 files changed, 2 insertions(+), 2 deletions(-)

test/link/macho.zig+2-2
...@@ -211,7 +211,7 @@ fn testDuplicateDefinitions(b: *Build, opts: Options) *Step {...@@ -211,7 +211,7 @@ fn testDuplicateDefinitions(b: *Build, opts: Options) *Step {
211 expectLinkErrors(exe, test_step, .{ .exact = &.{211 expectLinkErrors(exe, test_step, .{ .exact = &.{
212 "error: duplicate symbol definition: _strong",212 "error: duplicate symbol definition: _strong",
213 "note: defined by /?/a.o",213 "note: defined by /?/a.o",
214 "note: defined by /?/main.o",214 "note: defined by /?/main_zcu.o",
215 } });215 } });
216216
217 return test_step;217 return test_step;
...@@ -2648,7 +2648,7 @@ fn testUnresolvedError(b: *Build, opts: Options) *Step {...@@ -2648,7 +2648,7 @@ fn testUnresolvedError(b: *Build, opts: Options) *Step {
2648 expectLinkErrors(exe, test_step, .{ .exact = &.{2648 expectLinkErrors(exe, test_step, .{ .exact = &.{
2649 "error: undefined symbol: _foo",2649 "error: undefined symbol: _foo",
2650 "note: referenced by /?/a.o:_bar",2650 "note: referenced by /?/a.o:_bar",
2651 "note: referenced by /?/main.o:_main.main",2651 "note: referenced by /?/main_zcu.o:_main.main",
2652 } });2652 } });
2653 } else {2653 } else {
2654 expectLinkErrors(exe, test_step, .{ .exact = &.{2654 expectLinkErrors(exe, test_step, .{ .exact = &.{