Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'editors/code/src/util.ts')
-rw-r--r--editors/code/src/util.ts8
1 files changed, 6 insertions, 2 deletions
diff --git a/editors/code/src/util.ts b/editors/code/src/util.ts
index 38ce676157..e539452577 100644
--- a/editors/code/src/util.ts
+++ b/editors/code/src/util.ts
@@ -2,6 +2,7 @@ import * as vscode from "vscode";
import { strict as nativeAssert } from "assert";
import { exec, type ExecOptions, spawnSync } from "child_process";
import { inspect } from "util";
+import { Env } from "./client";
export function assert(condition: boolean, explanation: string): asserts condition {
try {
@@ -93,10 +94,13 @@ export function isDocumentInWorkspace(document: RustDocument): boolean {
return false;
}
-export function isValidExecutable(path: string): boolean {
+export function isValidExecutable(path: string, extraEnv: Env): boolean {
log.debug("Checking availability of a binary at", path);
- const res = spawnSync(path, ["--version"], { encoding: "utf8" });
+ const res = spawnSync(path, ["--version"], {
+ encoding: "utf8",
+ env: { ...process.env, ...extraEnv },
+ });
const printOutput = res.error ? log.warn : log.info;
printOutput(path, "--version:", res);