---

yaml
---
r: 4159
b: refs/heads/master
c: b0059bd
h: refs/heads/master
i:
  4157: 84b8eb1
  4155: 8704b59
  4151: 5a81023
  4143: 255fa0a
  4127: 9623c94
  4095: 1cb4a68
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c821ff03868c08e0c1b4c7caa730f8b7c560bd5
+refs/heads/master: b0059bd357404859aae3300e76ad3cc8a91b5364

trunk/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
 

trunk/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()