---

yaml
---
r: 3696
b: refs/heads/master
c: 94f782e
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64595a53f826b0fd8890707d0e63c119116f2a27
+refs/heads/master: 94f782e6a1e14b9eb89dd0429c4ad8f0e7ba0cf2

trunk/mk/stage0.mk

@@ -1,15 +1,4 @@
-# FIXME: Copying rt and rustllvm to stage0 is transitional until the snapshot
-# that begins including them
-stage0/lib/$(CFG_RUNTIME):	rt/$(CFG_RUNTIME)
-	@$(call E, cp: $@)
-	$(Q)cp $< $@
-
-stage0/lib/$(CFG_RUSTLLVM):	rustllvm/$(CFG_RUSTLLVM)
-	@$(call E, cp: $@)
-	$(Q)cp $< $@
-
-stage0/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES) \
-                  stage0/lib/$(CFG_RUNTIME) stage0/lib/$(CFG_RUSTLLVM)
+stage0/rustc$(X): $(S)src/snapshots.txt $(S)src/etc/get-snapshot.py $(MKFILES)
 	@$(call E, fetch: $@)
 	$(Q)$(S)src/etc/get-snapshot.py
 	$(Q)touch $@

trunk/src/etc/get-snapshot.py

@@ -9,7 +9,7 @@ def unpack_snapshot(snap):
   print("opening snapshot " + dl_path)
   tar = tarfile.open(dl_path)
   kernel = get_kernel()
-  for name in old_snapshot_files[kernel]:
+  for name in snapshot_files[kernel]:
     p = "rust-stage0/" + name
     fp = os.path.join("stage0", name)
     print("extracting " + fp)

trunk/src/etc/snapshot.py

@@ -15,13 +15,6 @@ def scrub(b):
 download_dir_base = "dl"
 download_unpack_base = os.path.join(download_dir_base, "unpack")
 
-# FIXME: This is transitional for moving rt/rustllvm into the snapshot
-old_snapshot_files = {
-    "linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib" ],
-    "macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/libstd.rlib" ],
-    "winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll", "lib/libstd.rlib" ]
-    }
-
 snapshot_files = {
     "linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib",
               "lib/librustrt.so", "lib/librustllvm.so"],

trunk/src/snapshots.txt

@@ -1,3 +1,8 @@
+S 2011-07-07 64595a5
+  linux-i386 bd5837c265e2f07034f01c016298aefa5697e3a5
+  macos-i386 6292b0c12e24f51b0270a6d07d3ed18ffe5c3143
+  winnt-i386 07e72b6b74542f235a62a486984e4d2ea2970dfd
+
 S 2011-07-07 6ee1ffe
   linux-i386 5080aaffc36748f41fa8bf8030ef5a51976e673f
   macos-i386 34db4f38c40ef5e7d08eb3e994def595297589bb