From 36539d7c3db3e807047d457e65fc3aeb3145bafa Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 5 Aug 2022 22:24:57 -0700 Subject: [PATCH] glfw: fix -fno-stage1 thisDir invocations Signed-off-by: Stephen Gutekanst --- glfw/build.zig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glfw/build.zig b/glfw/build.zig index aa94d8af..6d908ef4 100644 --- a/glfw/build.zig +++ b/glfw/build.zig @@ -13,7 +13,7 @@ pub fn build(b: *Builder) void { } pub fn testStep(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) *std.build.RunStep { - const main_tests = b.addTestExe("glfw_tests", thisDir() ++ "/src/main.zig"); + const main_tests = b.addTestExe("glfw_tests", (comptime thisDir()) ++ "/src/main.zig"); main_tests.setBuildMode(mode); main_tests.setTarget(target); link(b, main_tests, .{}); @@ -22,7 +22,7 @@ pub fn testStep(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget } fn testStepShared(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) *std.build.RunStep { - const main_tests = b.addTestExe("glfw_tests_shared", thisDir() ++ "/src/main.zig"); + const main_tests = b.addTestExe("glfw_tests_shared", (comptime thisDir()) ++ "/src/main.zig"); main_tests.setBuildMode(mode); main_tests.setTarget(target); link(b, main_tests, .{ .shared = true }); @@ -78,7 +78,7 @@ fn buildLibrary(b: *Builder, step: *std.build.LibExeObjStep, options: Options) * // TODO(build-system): https://github.com/hexops/mach/issues/229#issuecomment-1100958939 ensureDependencySubmodule(b.allocator, "upstream") catch unreachable; - const main_abs = thisDir() ++ "/src/main.zig"; + const main_abs = (comptime thisDir()) ++ "/src/main.zig"; const lib = if (options.shared) b.addSharedLibrary("glfw", main_abs, .unversioned) else b.addStaticLibrary("glfw", main_abs); lib.setBuildMode(step.build_mode); lib.setTarget(step.target);