diff options
| -rw-r--r-- | src/librustc_driver/driver.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index 442c139f14c..b02551b814e 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -46,6 +46,7 @@ use std::mem; use std::ffi::{OsString, OsStr}; use std::fs; use std::io::{self, Write}; +use std::iter; use std::path::{Path, PathBuf}; use syntax::{ast, diagnostics, visit}; use syntax::attr; @@ -667,7 +668,10 @@ pub fn phase_2_configure_and_expand<F>(sess: &Session, new_path.push(path); } } - env::set_var("PATH", &env::join_paths(new_path).unwrap()); + env::set_var("PATH", + &env::join_paths(new_path.iter() + .filter(|p| env::join_paths(iter::once(p)).is_ok())) + .unwrap()); } let features = sess.features.borrow(); let cfg = syntax::ext::expand::ExpansionConfig { |