Skip to content

Commit 17ae752

Browse files
committed
rustbuild: Update nightly date
Also fix a bug where we didn't clean out previous nightlies
1 parent 93a9ab1 commit 17ae752

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

src/bootstrap/bootstrap.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ def download_rust_nightly(self):
7373

7474
if self.rustc().startswith(self.bin_root()) and \
7575
(not os.path.exists(self.rustc()) or self.rustc_out_of_date()):
76+
shutil.rmtree(self.bin_root())
7677
filename = "rust-std-nightly-" + self.build + ".tar.gz"
7778
url = "https://static.rust-lang.org/dist/" + self.snap_rustc_date()
7879
tarball = os.path.join(rustc_cache, filename)

src/bootstrap/build/mod.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ mod sanity;
3939
mod step;
4040
mod util;
4141

42+
#[cfg(windows)]
43+
mod job;
44+
45+
#[cfg(not(windows))]
46+
mod job {
47+
pub unsafe fn setup() {}
48+
}
49+
4250
pub use build::config::Config;
4351
pub use build::flags::Flags;
4452

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

117-
// see comments in job.rs for what's going on here
118-
#[cfg(windows)]
119-
fn setup_job() {
120-
mod job;
121-
unsafe { job::setup() }
125+
unsafe {
126+
job::setup();
122127
}
123-
#[cfg(not(windows))] fn setup_job() {}
124-
setup_job();
125128

126129
if self.flags.clean {
127130
return clean::clean(self);

src/nightlies.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
rustc: 2015-12-19
1+
rustc: 2016-02-17
22
cargo: 2016-01-21

0 commit comments

Comments
 (0)