mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

auto merge of #17538 : brson/rust/winmk, r=alexcrichton

Browse source
This commit is contained in:
bors 2014-09-29 12:43:13 +00:00
commit 5079a10b1e
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

@ -488,7 +488,7 @@ esac
# Continue supporting the old --enable-nightly flag to transition the bots
# XXX Remove me
if [ $CFG_ENABLE_NIGHTLY -eq 1 ]
if [ ! -z "$CFG_ENABLE_NIGHTLY" ]
then
CFG_RELEASE_CHANNEL=nightly
putvar CFG_RELEASE_CHANNEL

3
mk/stage0.mk
View file

@ -3,8 +3,11 @@
$(HBIN0_H_$(CFG_BUILD))/:
mkdir -p $@
# On windows these two are the same, so cause a redifinition warning
ifneq ($(HBIN0_H_$(CFG_BUILD)),$(HLIB0_H_$(CFG_BUILD)))
$(HLIB0_H_$(CFG_BUILD))/:
mkdir -p $@
endif
$(SNAPSHOT_RUSTC_POST_CLEANUP): \
$(S)src/snapshots.txt \