Skip to content

Commit

Permalink
Auto merge of #850 - brson:nohacks, r=alexcrichton
Browse files Browse the repository at this point in the history
Remove some codegen hacks

These were to work around bugs in older compiler revisions.

r? @alexcrichton
  • Loading branch information
bors committed Dec 11, 2016
2 parents 26d2dcc + e308c56 commit 51aa295
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions src/rustup-cli/self_update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,7 @@ pub fn install(no_prompt: bool, verbose: bool,
mut opts: InstallOpts) -> Result<()> {

try!(do_pre_install_sanity_checks());
// FIXME: #695 This function is miscompiled and crashes.
// Even when I pin the compiler to an old nightly, 2016-08-10,
// which _does not crash_ on my machine, it still seems to be
// miscompiled on the deployed builds. I am very confused.
//try!(do_anti_sudo_check(no_prompt));
try!(do_anti_sudo_check(no_prompt));

if !no_prompt {
let ref msg = try!(pre_install_msg(opts.no_modify_path));
Expand Down Expand Up @@ -376,7 +372,6 @@ fn do_pre_install_sanity_checks() -> Result<()> {
#[allow(dead_code)]
fn do_anti_sudo_check(no_prompt: bool) -> Result<()> {
#[cfg(unix)]
#[inline(never)] // FIXME #679. Mysterious crashes on OS X 10.10+
pub fn home_mismatch() -> bool {
extern crate libc as c;

Expand Down

0 comments on commit 51aa295

Please sign in to comment.