aboutsummaryrefslogtreecommitdiff
path: root/build.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2022-02-17 20:46:40 -0700
committerAndrew Kelley <andrew@ziglang.org>2022-02-17 20:48:09 -0700
commit23567cdd984322c7428d43c8cbf8ecd40a2b7ec6 (patch)
tree8b11d624be627ecbf696bdb7c1299b08bda3c270 /build.zig
parent0bb22600bd7f1a99f3372f6c362fbfab24a2d6d4 (diff)
downloadzig-23567cdd984322c7428d43c8cbf8ecd40a2b7ec6.tar.gz
zig-23567cdd984322c7428d43c8cbf8ecd40a2b7ec6.zip
build.zig: fix test-stage2 regression with -Denable-llvm
Regressed in cc9eb9e90fec961a74e90e1ab3d66a7b8ec14f47 due to a merge conflict.
Diffstat (limited to 'build.zig')
-rw-r--r--build.zig4
1 files changed, 3 insertions, 1 deletions
diff --git a/build.zig b/build.zig
index 1ee8a21bda..fc8e6dced1 100644
--- a/build.zig
+++ b/build.zig
@@ -253,7 +253,7 @@ pub fn build(b: *Builder) !void {
zig0.defineCMacro("ZIG_VERSION_PATCH", b.fmt("{d}", .{zig_version.patch}));
zig0.defineCMacro("ZIG_VERSION_STRING", b.fmt("\"{s}\"", .{version}));
- for ([_]*std.build.LibExeObjStep{ zig0, exe }) |artifact| {
+ for ([_]*std.build.LibExeObjStep{ zig0, exe, test_stage2 }) |artifact| {
artifact.addIncludePath("src");
artifact.addIncludePath("deps/SoftFloat-3e/source/include");
artifact.addIncludePath("deps/SoftFloat-3e-prebuilt");
@@ -328,9 +328,11 @@ pub fn build(b: *Builder) !void {
}
try addCmakeCfgOptionsToExe(b, cfg, exe, use_zig_libcxx);
+ try addCmakeCfgOptionsToExe(b, cfg, test_stage2, use_zig_libcxx);
} else {
// Here we are -Denable-llvm but no cmake integration.
try addStaticLlvmOptionsToExe(exe);
+ try addStaticLlvmOptionsToExe(test_stage2);
}
}