OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Fix linker failure on windows

Fixes #38933.

r? @ollie27
This commit is contained in:
bors 2017-01-17 00:50:52 +00:00
parent c2b19c109e 6f58b7f0ab
commit 4ce7accaa7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc_driver/driver.rs
View File

@ -46,6 +46,7 @@ use std::mem;
use std::ffi::{OsString, OsStr}; use std::ffi::{OsString, OsStr};
use std::fs; use std::fs;
use std::io::{self, Write}; use std::io::{self, Write};
use std::iter;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use syntax::{ast, diagnostics, visit}; use syntax::{ast, diagnostics, visit};
use syntax::attr; use syntax::attr;
@ -667,7 +668,10 @@ pub fn phase_2_configure_and_expand<F>(sess: &Session,
new_path.push(path); 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 features = sess.features.borrow();
let cfg = syntax::ext::expand::ExpansionConfig { let cfg = syntax::ext::expand::ExpansionConfig {