---

yaml
---
r: 3476
b: refs/heads/master
c: 8655349
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd799a0a7a06cdef8c56fa4cbb66d7a8f64bc879
+refs/heads/master: 865534978fdd9da9cc5dd1dbf608206810bc8dee

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 snapshot_files[kernel]:
+  for name in old_snapshot_files[kernel]:
     p = "rust-stage0/" + name
     fp = os.path.join("stage0", name)
     print("extracting " + fp)

trunk/src/etc/snapshot.py

@@ -15,10 +15,17 @@ def scrub(b):
 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):