Skip to content

Commit

Permalink
Prefer bundled gcc. External gcc can still be used if one provides a …
Browse files Browse the repository at this point in the history
…full path via -Clinker=...
  • Loading branch information
vadimcn committed Sep 20, 2014
1 parent 04c41eb commit 94f0532
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/librustc/driver/driver.rs
Expand Up @@ -562,8 +562,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", (), |_|
Expand Down

9 comments on commit 94f0532

@bors
Copy link
Contributor

@bors bors commented on 94f0532 Sep 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at vadimcn@94f0532

@bors
Copy link
Contributor

@bors bors commented on 94f0532 Sep 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging vadimcn/rust/gccpref = 94f0532 into auto

@bors
Copy link
Contributor

@bors bors commented on 94f0532 Sep 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vadimcn/rust/gccpref = 94f0532 merged ok, testing candidate = b395d053

@bors
Copy link
Contributor

@bors bors commented on 94f0532 Sep 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 94f0532 Sep 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at vadimcn@94f0532

@bors
Copy link
Contributor

@bors bors commented on 94f0532 Sep 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging vadimcn/rust/gccpref = 94f0532 into auto

@bors
Copy link
Contributor

@bors bors commented on 94f0532 Sep 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vadimcn/rust/gccpref = 94f0532 merged ok, testing candidate = 8d3728f

@bors
Copy link
Contributor

@bors bors commented on 94f0532 Sep 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 94f0532 Sep 21, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 8d3728f

Please sign in to comment.