about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-04-14 13:42:45 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-04-15 19:45:00 -0700
commitefec34a95a76212b2324d98f3f6d94a1397c2544 (patch)
tree2499445ee99c3271d90d137e9258ed89a5e0249b
parentca5babea5f12ed57365740c959b4f3c7316474a7 (diff)
downloadrust-efec34a95a76212b2324d98f3f6d94a1397c2544.tar.gz
rust-efec34a95a76212b2324d98f3f6d94a1397c2544.zip
mk: Change windows to install from stage2
In the past, windows was installed from stage3 to guarantee convergence between
the host and target artifacts, but syntax extensions on all platforms are
currently relying on convergence, so special casing this one platform has become
less relevant over time.

This will also have the added benefit of dealing with #13474 and #13491. These
issues will be closed after next next nightly is confirmed to fix them.
-rw-r--r--mk/prepare.mk6
1 files changed, 0 insertions, 6 deletions
diff --git a/mk/prepare.mk b/mk/prepare.mk
index d850aba27cd..096887056bf 100644
--- a/mk/prepare.mk
+++ b/mk/prepare.mk
@@ -20,13 +20,7 @@
 #   PREPARE_TARGETS - the target triples, space separated
 #   PREPARE_DEST_DIR - the directory to put the image
 
-
-# On windows we install from stage3, but on unix only stage2
-ifdef CFG_WINDOWSY_$(CFG_BUILD)
-PREPARE_STAGE=3
-else
 PREPARE_STAGE=2
-endif
 
 DEFAULT_PREPARE_DIR_CMD = umask 022 && mkdir -p
 DEFAULT_PREPARE_BIN_CMD = install -m755