Permalink
Browse files

Auto merge of #38949 - GuillaumeGomez:fix_linker, r=nagisa

Fix linker failure on windows

Fixes #38933.

r? @ollie27
  • Loading branch information...
2 parents c2b19c1 + 6f58b7f commit 4ce7accaa7e64af918e5e8b3fee65096132350f6 @bors bors committed Jan 17, 2017
Showing with 5 additions and 1 deletion.
  1. +5 −1 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 {

0 comments on commit 4ce7acc

Please sign in to comment.