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

auto merge of #17412 : vadimcn/rust/gccpref, r=alexcrichton

Browse Source 
Fixes #17251
This commit is contained in:
bors 2014-09-21 16:30:28 +00:00
commit 8d3728fae0
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/etc/make-win-dist.py
View File

@ -58,15 +58,15 @@ def make_win_dist(dist_root, target_triple):
for src in rustc_dlls:
shutil.copy(src, dist_bin_dir)
# Copy platform tools (and another copy of runtime dlls) to platform-spcific bin directory
target_bin_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "bin")
# Copy platform tools to platform-specific bin directory
target_bin_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "gcc", "bin")
if not os.path.exists(target_bin_dir):
os.makedirs(target_bin_dir)
for src in target_tools:
shutil.copy(src, target_bin_dir)
# Copy platform libs to platform-spcific lib directory
target_lib_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "lib")
target_lib_dir = os.path.join(dist_root, "bin", "rustlib", target_triple, "gcc", "lib")
if not os.path.exists(target_lib_dir):
os.makedirs(target_lib_dir)
for src in target_libs:

4
src/librustc/driver/driver.rs
View File

@ -560,8 +560,8 @@ pub fn phase_6_link_output(sess: &Session,
trans: &CrateTranslation,
outputs: &OutputFilenames) {
let old_path = os::getenv("PATH").unwrap_or_else(||String::new());
let mut new_path = os::split_paths(old_path.as_slice());
new_path.push_all_move(sess.host_filesearch().get_tools_search_paths());
let mut new_path = sess.host_filesearch().get_tools_search_paths();
new_path.push_all_move(os::split_paths(old_path.as_slice()));
os::setenv("PATH", os::join_paths(new_path.as_slice()).unwrap());
time(sess.time_passes(), "linking", (), |_|

8
src/librustc/metadata/filesearch.rs
View File

@ -150,8 +150,12 @@ impl<'a> FileSearch<'a> {
p.push(find_libdir(self.sysroot));
p.push(rustlibdir());
p.push(self.triple);
p.push("bin");
vec![p]
let mut p1 = p.clone();
p1.push("bin");
let mut p2 = p.clone();
p2.push("gcc");
p2.push("bin");
vec![p1, p2]
}
}