squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

driver: Improve check for rustc arg

Browse source 
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.
This commit is contained in:
Michael Wright 2018-09-06 07:01:56 +02:00
parent ed38d9c79f
commit 4f7a260472
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/driver.rs
View file

@ -6,6 +6,7 @@
use rustc_driver::{self, driver::CompileController, Compilation}; use rustc_driver::{self, driver::CompileController, Compilation};
use rustc_plugin; use rustc_plugin;
use std::path::Path;
use std::process::{exit, Command}; use std::process::{exit, Command};
#[allow(clippy::print_stdout)] #[allow(clippy::print_stdout)]
@ -47,7 +48,7 @@ pub fn main() {
if orig_args.len() <= 1 { if orig_args.len() <= 1 {
std::process::exit(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 // we still want to be able to invoke it normally though
orig_args.remove(1); orig_args.remove(1);
} }