From 27e83d6b0e8430c2e65507718aade527c5c1523e Mon Sep 17 00:00:00 2001 From: Fabian Date: Wed, 14 Sep 2022 00:32:10 +0900 Subject: [PATCH] support rust installed without rustup --- tools/rust-lld-wrapper | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/rust-lld-wrapper b/tools/rust-lld-wrapper index 54f2aa35..494f3ebe 100755 --- a/tools/rust-lld-wrapper +++ b/tools/rust-lld-wrapper @@ -45,7 +45,10 @@ def find_host_triplet(): return host.group(1) def find_rust_lld(): - which = subprocess.run(["rustup", "which", "rustc"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + try: + which = subprocess.run(["rustup", "which", "rustc"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + except FileNotFoundError: + return "lld" which.check_returncode() rustc_path = which.stdout.decode("utf8").strip()