From b0059bd357404859aae3300e76ad3cc8a91b5364 Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Wed, 27 Jul 2011 11:34:39 +0200
Subject: [PATCH] Hack to make snap-stage1 actually build incompatible changes

You can't build libstd both with stage0 and stage1 if the two are incompatible

This is probably temporary
---
 mk/snap.mk          | 3 +--
 src/etc/snapshot.py | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mk/snap.mk b/mk/snap.mk
index 6e9cc407241b..dc9064417d4e 100644
--- a/mk/snap.mk
+++ b/mk/snap.mk
@@ -1,6 +1,5 @@
 
-snap-stage1: stage1/rustc$(X) stage1/lib/glue.o stage1/lib/$(CFG_STDLIB) \
-	stage1/lib/libstd.rlib stage1/lib/$(CFG_RUNTIME) \
+snap-stage1: stage1/rustc$(X) stage1/lib/glue.o stage1/lib/$(CFG_RUNTIME) \
 	stage1/$(CFG_RUSTLLVM)
 	$(S)src/etc/make-snapshot.py stage1
 
diff --git a/src/etc/snapshot.py b/src/etc/snapshot.py
index 88caf2789b14..45704e025676 100644
--- a/src/etc/snapshot.py
+++ b/src/etc/snapshot.py
@@ -120,7 +120,10 @@ def make_snapshot(stage):
 
     tar = tarfile.open(file0, "w:bz2")
     for name in snapshot_files[kernel]:
-      tar.add(os.path.join(stage, name),
+      dir = stage
+      if stage == "stage1" and re.match(r"^lib/(lib)?std.*", name):
+        dir = "stage0"
+      tar.add(os.path.join(dir, name),
               "rust-stage0/" + name)
     tar.close()