From 865534978fdd9da9cc5dd1dbf608206810bc8dee Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 29 Jun 2011 15:39:30 -0700
Subject: [PATCH] Change snapshot logic to archive glue.o from the lib
 directory

---
 src/etc/get-snapshot.py | 2 +-
 src/etc/snapshot.py     | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/etc/get-snapshot.py b/src/etc/get-snapshot.py
index 98e480defda..aa64a4fb49a 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 snapshot_files[kernel]:
+  for name in old_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 3922d7314f7..8885abf1e4e 100644
--- a/src/etc/snapshot.py
+++ b/src/etc/snapshot.py
@@ -15,10 +15,17 @@ download_url_base = "http://dl.rust-lang.org/stage0-snapshots"
 download_dir_base = "dl"
 download_unpack_base = os.path.join(download_dir_base, "unpack")
 
-snapshot_files = {
+# FIXME: This is transitional for moving glue.o to the lib directory
+old_snapshot_files = {
     "linux": ["rustc", "glue.o", "lib/libstd.so" ],
     "macos": ["rustc", "glue.o", "lib/libstd.dylib" ],
     "winnt": ["rustc.exe", "glue.o", "lib/std.dll" ]
+}
+
+snapshot_files = {
+    "linux": ["rustc", "lib/glue.o", "lib/libstd.so" ],
+    "macos": ["rustc", "lib/glue.o", "lib/libstd.dylib" ],
+    "winnt": ["rustc.exe", "lib/glue.o", "lib/std.dll" ]
     }
 
 def parse_line(n, line):