From 15a670a1b1b43991679b17c14eb5d188058f708a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
 <respindola@mozilla.com>
Date: Mon, 11 Jul 2011 14:32:18 -0400
Subject: [PATCH] Use new snapshot.

---
 mk/stage0.mk            | 7 ++-----
 src/etc/get-snapshot.py | 2 +-
 src/etc/snapshot.py     | 9 ---------
 src/snapshots.txt       | 5 +++++
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/mk/stage0.mk b/mk/stage0.mk
index 8b57cfd8001..7f5210e15e7 100644
--- a/mk/stage0.mk
+++ b/mk/stage0.mk
@@ -11,8 +11,5 @@ stage0/lib/glue.o: stage0/rustc$(X)
 stage0/lib/$(CFG_STDLIB): stage0/rustc$(X)
 	$(Q)touch $@
 
-# TODO: Include as part of the snapshot.
-stage0/intrinsics.bc:   $(INTRINSICS_BC)
-	@$(call E, cp: $@)
-	$(Q)cp $< $@
-
+stage0/intrinsics.bc: stage0/rustc$(X)
+	$(Q)touch $@
diff --git a/src/etc/get-snapshot.py b/src/etc/get-snapshot.py
index aa64a4fb49a..98e480defda 100755
--- a/src/etc/get-snapshot.py
+++ b/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)
diff --git a/src/etc/snapshot.py b/src/etc/snapshot.py
index dadd4da24bc..b3ebce018e2 100644
--- a/src/etc/snapshot.py
+++ b/src/etc/snapshot.py
@@ -15,15 +15,6 @@ download_url_base = "http://dl.rust-lang.org/stage0-snapshots"
 download_dir_base = "dl"
 download_unpack_base = os.path.join(download_dir_base, "unpack")
 
-old_snapshot_files = {
-    "linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib",
-              "lib/librustrt.so", "lib/librustllvm.so"],
-    "macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/libstd.rlib",
-              "lib/librustrt.dylib", "lib/librustllvm.dylib"],
-    "winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll", "lib/libstd.rlib",
-              "lib/rustrt.dll", "lib/rustllvm.dll"]
-    }
-
 snapshot_files = {
     "linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/libstd.rlib",
               "lib/librustrt.so", "lib/librustllvm.so", "intrinsics.bc"],
diff --git a/src/snapshots.txt b/src/snapshots.txt
index 12b67313eb9..38ff50d9d00 100644
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -1,3 +1,8 @@
+S 2011-07-11 f666c97
+  linux-i386 434346526e3feecf80ceb58f132fb4ea6cbfec0a
+  macos-i386 f643f88b1414bf43c1821a9d3eea0bdc8df2f68d
+  winnt-i386 67e09bf1fb2ae0894cfc99fabee1ed716f218486
+
 S 2011-07-09 f42c947
   linux-i386 9cb82d02baaccc6efc1b5dff5f3d41aa0c8546e8
   macos-i386 5fd5b3fff6bdaaffc5a55d208370d3764076b54e