From f1afc8184425b74ec04cd0c8da29cc4623c04597 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Tue, 18 Jan 2022 00:06:56 -0800 Subject: [PATCH] cmd/fetch- forgot to actually update vcpkg status based on packages --- deps.zig | 1 + src/cmd/fetch.zig | 1 + 2 files changed, 2 insertions(+) diff --git a/deps.zig b/deps.zig index 3ade91cf86ef1bd63da1f1a63577b879fd45ff99..8a23baad23e93d53a3001f5fcddc9dd408a7573a 100644 --- a/deps.zig +++ b/deps.zig @@ -26,6 +26,7 @@ pub fn addAllTo(exe: *std.build.LibExeObjStep) void { exe.addCSourceFile(@field(dirs, decl.name) ++ "/" ++ item, pkg.c_source_flags); llc = true; } + vcpkg = vcpkg or pkg.vcpkg; } if (llc) exe.linkLibC(); if (builtin.os.tag == .windows and vcpkg) exe.addVcpkgPaths(.static) catch |err| @panic(@errorName(err)); diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig index 9faa35a771a32e2e23cf01da1fb4561cf7578a81..5b06a5215230abda735d0f4d85e44c86f185c306 100644 --- a/src/cmd/fetch.zig +++ b/src/cmd/fetch.zig @@ -74,6 +74,7 @@ pub fn create_depszig(cachepath: string, dir: std.fs.Dir, top_module: zigmod.Mod \\ exe.addCSourceFile(@field(dirs, decl.name) ++ "/" ++ item, pkg.c_source_flags); \\ llc = true; \\ } + \\ vcpkg = vcpkg or pkg.vcpkg; \\ } \\ if (llc) exe.linkLibC(); \\ if (builtin.os.tag == .windows and vcpkg) exe.addVcpkgPaths(.static) catch |err| @panic(@errorName(err)); -- 2.54.0