authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2022-01-18 00:06:56 -08:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2022-01-18 00:06:56 -08:00
logf1afc8184425b74ec04cd0c8da29cc4623c04597
tree8652db6c8bbdee3812ce8379916aafbaa7acf81a
parentdf7611a6f5a71989107000f1a76cbff61e18e6aa

cmd/fetch- forgot to actually update vcpkg status based on packages

2 files changed, 2 insertions(+), 0 deletions(-)

deps.zig+1
...@@ -26,6 +26,7 @@ pub fn addAllTo(exe: *std.build.LibExeObjStep) void {...@@ -26,6 +26,7 @@ pub fn addAllTo(exe: *std.build.LibExeObjStep) void {
26 exe.addCSourceFile(@field(dirs, decl.name) ++ "/" ++ item, pkg.c_source_flags);26 exe.addCSourceFile(@field(dirs, decl.name) ++ "/" ++ item, pkg.c_source_flags);
27 llc = true;27 llc = true;
28 }28 }
29 vcpkg = vcpkg or pkg.vcpkg;
29 }30 }
30 if (llc) exe.linkLibC();31 if (llc) exe.linkLibC();
31 if (builtin.os.tag == .windows and vcpkg) exe.addVcpkgPaths(.static) catch |err| @panic(@errorName(err));32 if (builtin.os.tag == .windows and vcpkg) exe.addVcpkgPaths(.static) catch |err| @panic(@errorName(err));
src/cmd/fetch.zig+1
...@@ -74,6 +74,7 @@ pub fn create_depszig(cachepath: string, dir: std.fs.Dir, top_module: zigmod.Mod...@@ -74,6 +74,7 @@ pub fn create_depszig(cachepath: string, dir: std.fs.Dir, top_module: zigmod.Mod
74 \\ exe.addCSourceFile(@field(dirs, decl.name) ++ "/" ++ item, pkg.c_source_flags);74 \\ exe.addCSourceFile(@field(dirs, decl.name) ++ "/" ++ item, pkg.c_source_flags);
75 \\ llc = true;75 \\ llc = true;
76 \\ }76 \\ }
77 \\ vcpkg = vcpkg or pkg.vcpkg;
77 \\ }78 \\ }
78 \\ if (llc) exe.linkLibC();79 \\ if (llc) exe.linkLibC();
79 \\ if (builtin.os.tag == .windows and vcpkg) exe.addVcpkgPaths(.static) catch |err| @panic(@errorName(err));80 \\ if (builtin.os.tag == .windows and vcpkg) exe.addVcpkgPaths(.static) catch |err| @panic(@errorName(err));