zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

freetype: improve compatibility with -fno-stage1

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-08-15 21:43:28 -07:00
parent fcbd12e36c
commit e13b3078a5
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
freetype/build.zig
View file

@ -86,7 +86,7 @@ pub fn build(b: *std.build.Builder) !void {
} }
pub fn testStep(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) *std.build.RunStep { pub fn testStep(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) *std.build.RunStep {
const main_tests = b.addTestExe("freetype-tests", thisDir() ++ "/src/main.zig"); const main_tests = b.addTestExe("freetype-tests", (comptime thisDir()) ++ "/src/main.zig");
main_tests.setBuildMode(mode); main_tests.setBuildMode(mode);
main_tests.setTarget(target); main_tests.setTarget(target);
main_tests.addPackage(c_pkg); main_tests.addPackage(c_pkg);
@ -101,7 +101,7 @@ pub fn testStep(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget
}, },
.harfbuzz = .{}, .harfbuzz = .{},
}); });
main_tests.main_pkg_path = thisDir(); main_tests.main_pkg_path = (comptime thisDir());
main_tests.install(); main_tests.install();
return main_tests.run(); return main_tests.run();
} }
@ -197,7 +197,7 @@ fn ensureDependencySubmodule(allocator: std.mem.Allocator, path: []const u8) !vo
if (std.mem.eql(u8, no_ensure_submodules, "true")) return; if (std.mem.eql(u8, no_ensure_submodules, "true")) return;
} else |_| {} } else |_| {}
var child = std.ChildProcess.init(&.{ "git", "submodule", "update", "--init", path }, allocator); var child = std.ChildProcess.init(&.{ "git", "submodule", "update", "--init", path }, allocator);
child.cwd = thisDir(); child.cwd = (comptime thisDir());
child.stderr = std.io.getStdErr(); child.stderr = std.io.getStdErr();
child.stdout = std.io.getStdOut(); child.stdout = std.io.getStdOut();