Skip to content

Commit

Permalink
rustbuild: Update nightly date
Browse files Browse the repository at this point in the history
Also fix a bug where we didn't clean out previous nightlies
  • Loading branch information
alexcrichton committed Feb 28, 2016
1 parent 93a9ab1 commit 17ae752
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
1 change: 1 addition & 0 deletions src/bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ def download_rust_nightly(self):

if self.rustc().startswith(self.bin_root()) and \
(not os.path.exists(self.rustc()) or self.rustc_out_of_date()):
shutil.rmtree(self.bin_root())
filename = "rust-std-nightly-" + self.build + ".tar.gz"
url = "https://static.rust-lang.org/dist/" + self.snap_rustc_date()
tarball = os.path.join(rustc_cache, filename)
Expand Down
17 changes: 10 additions & 7 deletions src/bootstrap/build/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,14 @@ mod sanity;
mod step;
mod util;

#[cfg(windows)]
mod job;

#[cfg(not(windows))]
mod job {
pub unsafe fn setup() {}
}

pub use build::config::Config;
pub use build::flags::Flags;

Expand Down Expand Up @@ -114,14 +122,9 @@ impl Build {
pub fn build(&mut self) {
use build::step::Source::*;

// see comments in job.rs for what's going on here
#[cfg(windows)]
fn setup_job() {
mod job;
unsafe { job::setup() }
unsafe {
job::setup();
}
#[cfg(not(windows))] fn setup_job() {}
setup_job();

if self.flags.clean {
return clean::clean(self);
Expand Down
2 changes: 1 addition & 1 deletion src/nightlies.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
rustc: 2015-12-19
rustc: 2016-02-17
cargo: 2016-01-21

0 comments on commit 17ae752

Please sign in to comment.