From e4aa73c0f9914050ee125f439a07ced825dfb960 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Wed, 7 Dec 2011 15:34:16 -0800
Subject: [PATCH] Change snapshot script to pick up host libcore as well.

---
 src/etc/get-snapshot.py |  3 +++
 src/etc/snapshot.py     | 21 +++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/etc/get-snapshot.py b/src/etc/get-snapshot.py
index 40fbd70cf71..630e3dd8a9e 100755
--- a/src/etc/get-snapshot.py
+++ b/src/etc/get-snapshot.py
@@ -10,6 +10,9 @@ def unpack_snapshot(triple, snap):
   tar = tarfile.open(dl_path)
   kernel = get_kernel(triple)
   for name in snapshot_files[kernel]:
+    # FIXME: temporary hack to make transition, remove soon.
+    if "core" in name:
+      continue
     p = "rust-stage0/" + name
     stagep = os.path.join(triple, "stage0")
     fp = os.path.join(stagep, name)
diff --git a/src/etc/snapshot.py b/src/etc/snapshot.py
index db0d5f97aaf..b8e3a5c8983 100644
--- a/src/etc/snapshot.py
+++ b/src/etc/snapshot.py
@@ -16,12 +16,21 @@ download_dir_base = "dl"
 download_unpack_base = os.path.join(download_dir_base, "unpack")
 
 snapshot_files = {
-    "linux": ["bin/rustc", "lib/libruststd.so",
-              "lib/librustrt.so", "lib/librustllvm.so"],
-    "macos": ["bin/rustc", "lib/libruststd.dylib",
-              "lib/librustrt.dylib", "lib/librustllvm.dylib"],
-    "winnt": ["bin/rustc.exe", "lib/ruststd.dll",
-              "lib/rustrt.dll", "lib/rustllvm.dll"]
+    "linux": ["bin/rustc",
+              "lib/libcore.so",
+              "lib/libruststd.so",
+              "lib/librustrt.so",
+              "lib/librustllvm.so"],
+    "macos": ["bin/rustc",
+              "lib/libcore.dylib",
+              "lib/libruststd.dylib",
+              "lib/librustrt.dylib",
+              "lib/librustllvm.dylib"],
+    "winnt": ["bin/rustc.exe",
+              "lib/core.dll",
+              "lib/ruststd.dll",
+              "lib/rustrt.dll",
+              "lib/rustllvm.dll"]
     }
 
 def parse_line(n, line):