Eliminate glue.o. Closes #990

This commit is contained in:
Brian Anderson 2011-09-28 15:26:11 -07:00
parent e1ba559c03
commit 15e34deba3
10 changed files with 25 additions and 79 deletions

View file

@ -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)

View file

@ -15,7 +15,8 @@ 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: Transitional
old_snapshot_files = {
"linux": ["rustc", "lib/glue.o", "lib/libstd.so", "lib/main.o",
"librustrt.so", "librustllvm.so", "lib/intrinsics.bc"],
"macos": ["rustc", "lib/glue.o", "lib/libstd.dylib", "lib/main.o",
@ -24,6 +25,15 @@ snapshot_files = {
"rustrt.dll", "rustllvm.dll", "lib/intrinsics.bc"]
}
snapshot_files = {
"linux": ["rustc", "lib/libstd.so", "lib/main.o",
"librustrt.so", "librustllvm.so", "lib/intrinsics.bc"],
"macos": ["rustc", "lib/libstd.dylib", "lib/main.o",
"librustrt.dylib", "librustllvm.dylib", "lib/intrinsics.bc"],
"winnt": ["rustc.exe", "lib/std.dll", "lib/main.o",
"rustrt.dll", "rustllvm.dll", "lib/intrinsics.bc"]
}
def parse_line(n, line):
global snapshotfile