From 4f7a260472d1722c8b2bf0771c875e69f3a2bf48 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Thu, 6 Sep 2018 07:01:56 +0200 Subject: [PATCH] driver: Improve check for rustc arg The rustc arg might not be exactly "rustc". It may be any path to a rustc executable (especially if the RUSTC environment variable is set when executing cargo). Rather check that it is a path with 'rustc' file stem. --- src/driver.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/driver.rs b/src/driver.rs index 26ff846177b..267e460ad2e 100644 --- a/src/driver.rs +++ b/src/driver.rs @@ -6,6 +6,7 @@ use rustc_driver::{self, driver::CompileController, Compilation}; use rustc_plugin; +use std::path::Path; use std::process::{exit, Command}; #[allow(clippy::print_stdout)] @@ -47,7 +48,7 @@ pub fn main() { if orig_args.len() <= 1 { std::process::exit(1); } - if orig_args[1] == "rustc" { + if Path::new(&orig_args[1]).file_stem() == Some("rustc".as_ref()) { // we still want to be able to invoke it normally though orig_args.remove(1); } -- 2.44.0