authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-02-17 20:46:40-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-02-17 20:48:09-07:00
log23567cdd984322c7428d43c8cbf8ecd40a2b7ec6
tree8b11d624be627ecbf696bdb7c1299b08bda3c270
parent0bb22600bd7f1a99f3372f6c362fbfab24a2d6d4

build.zig: fix test-stage2 regression with -Denable-llvm

Regressed in cc9eb9e90fec961a74e90e1ab3d66a7b8ec14f47 due to a merge conflict.

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

build.zig+3-1
...@@ -253,7 +253,7 @@ pub fn build(b: *Builder) !void {...@@ -253,7 +253,7 @@ pub fn build(b: *Builder) !void {
253 zig0.defineCMacro("ZIG_VERSION_PATCH", b.fmt("{d}", .{zig_version.patch}));253 zig0.defineCMacro("ZIG_VERSION_PATCH", b.fmt("{d}", .{zig_version.patch}));
254 zig0.defineCMacro("ZIG_VERSION_STRING", b.fmt("\"{s}\"", .{version}));254 zig0.defineCMacro("ZIG_VERSION_STRING", b.fmt("\"{s}\"", .{version}));
255255
256 for ([_]*std.build.LibExeObjStep{ zig0, exe }) |artifact| {256 for ([_]*std.build.LibExeObjStep{ zig0, exe, test_stage2 }) |artifact| {
257 artifact.addIncludePath("src");257 artifact.addIncludePath("src");
258 artifact.addIncludePath("deps/SoftFloat-3e/source/include");258 artifact.addIncludePath("deps/SoftFloat-3e/source/include");
259 artifact.addIncludePath("deps/SoftFloat-3e-prebuilt");259 artifact.addIncludePath("deps/SoftFloat-3e-prebuilt");
...@@ -328,9 +328,11 @@ pub fn build(b: *Builder) !void {...@@ -328,9 +328,11 @@ pub fn build(b: *Builder) !void {
328 }328 }
329329
330 try addCmakeCfgOptionsToExe(b, cfg, exe, use_zig_libcxx);330 try addCmakeCfgOptionsToExe(b, cfg, exe, use_zig_libcxx);
331 try addCmakeCfgOptionsToExe(b, cfg, test_stage2, use_zig_libcxx);
331 } else {332 } else {
332 // Here we are -Denable-llvm but no cmake integration.333 // Here we are -Denable-llvm but no cmake integration.
333 try addStaticLlvmOptionsToExe(exe);334 try addStaticLlvmOptionsToExe(exe);
335 try addStaticLlvmOptionsToExe(test_stage2);
334 }336 }
335 }337 }
336338