mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-02 05:39:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(build.zig): replace slashes in filepaths #37111

Browse Source 
Problem:
`zig build` fails if `b.install_path` and `b.lib_dir` contain backslashes (on Windows).

Solution:
Replace backslashes (\) with forward slashes (/).
This commit is contained in:
Eamon Burns
2026-01-07 21:31:24 -08:00
committed by GitHub
parent 3e83f7bec7
commit 565cfa04eb
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.zig
View File

@@ -229,11 +229,13 @@ pub fn build(b: *std.Build) !void {
}); });
_ = gen_config.addCopyFile(sysconfig_step.getOutput(), "auto/config.h"); // run_preprocessor() workaronnd _ = gen_config.addCopyFile(sysconfig_step.getOutput(), "auto/config.h"); // run_preprocessor() workaronnd
_ = gen_config.add("auto/pathdef.h", b.fmt( _ = gen_config.add("auto/pathdef.h", b.fmt(
\\char *default_vim_dir = "{s}/share/nvim"; \\char *default_vim_dir = "{s}/share/nvim";
\\char *default_vimruntime_dir = ""; \\char *default_vimruntime_dir = "";
\\char *default_lib_dir = "{s}/nvim"; \\char *default_lib_dir = "{s}/nvim";
, .{ b.install_path, b.lib_dir })); // b.lib_dir is typically b.install_path + "/lib" but may be overridden // b.lib_dir is typically b.install_path + "/lib" but may be overridden
, .{ try replace_backslashes(b, b.install_path), try replace_backslashes(b, b.lib_dir) }));
const opt_version_string = b.option([]const u8, "version-string", "Override Neovim version string. Default is to find out with git."); const opt_version_string = b.option([]const u8, "version-string", "Override Neovim version string. Default is to find out with git.");
const version_medium = if (opt_version_string) |version_string| version_string else v: { const version_medium = if (opt_version_string) |version_string| version_string else v: {
@@ -517,7 +519,9 @@ pub fn lua_version_info(b: *std.Build) []u8 {
, .{ v.major, v.minor, v.patch, v.prerelease.len > 0, v.api_level, v.api_level_compat, v.api_prerelease }); , .{ v.major, v.minor, v.patch, v.prerelease.len > 0, v.api_level, v.api_level_compat, v.api_prerelease });
} }
fn esc(b: *std.Build, input: []const u8) ![]const u8 { /// Replace all backslashes in `input` with with forward slashes when the target is Windows.
/// Returned memory is stored in `b.graph.arena`.
fn replace_backslashes(b: *std.Build, input: []const u8) ![]const u8 {
return if (b.graph.host.result.os.tag == .windows) return if (b.graph.host.result.os.tag == .windows)
std.mem.replaceOwned(u8, b.graph.arena, input, "\\", "/") std.mem.replaceOwned(u8, b.graph.arena, input, "\\", "/")
else else
@@ -545,5 +549,5 @@ pub fn test_config(b: *std.Build) ![]u8 {
\\M.include_paths = _G.c_include_path or {{}} \\M.include_paths = _G.c_include_path or {{}}
\\ \\
\\return M \\return M
, .{ .bin_dir = try esc(b, b.install_path), .src_path = try esc(b, src_path) }); , .{ .bin_dir = try replace_backslashes(b, b.install_path), .src_path = try replace_backslashes(b, src_path) });
} }