From 01f9c600afa9523b56992e3336a7c78511bac046 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Wed, 28 Jun 2023 10:04:12 +1000 Subject: [PATCH] Use overriden node/protoc binaries as inputs https://forums.ankiweb.net/t/getting-error-when-python-protoc-and-node-binary-path-set-in-environment/31615 --- build/ninja_gen/src/node.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/ninja_gen/src/node.rs b/build/ninja_gen/src/node.rs index 0b64ce086..2c7325994 100644 --- a/build/ninja_gen/src/node.rs +++ b/build/ninja_gen/src/node.rs @@ -52,7 +52,7 @@ impl BuildAction for YarnSetup { } fn files(&mut self, build: &mut impl build::FilesHandle) { - build.add_inputs("", inputs![":extract:node"]); + build.add_inputs("", inputs!["$node_binary"]); build.add_outputs_ext( "bin", vec![if cfg!(windows) { @@ -368,7 +368,7 @@ impl BuildAction for GenTypescriptProto<'_> { .map(|d| format!("-I {d}")) .join(" "), ); - build.add_inputs("protoc", inputs![":extract:protoc:bin"]); + build.add_inputs("protoc", inputs!["$protoc_binary"]); build.add_inputs("gen-es", inputs![":node_modules:protoc-gen-es"]); if cfg!(windows) { build.add_env_var(