about summary refs log tree commit diff
path: root/src/rt/rust.cpp
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2012-09-24 13:57:48 -0700
committerPatrick Walton <pcwalton@mimiga.net>2012-09-24 13:57:48 -0700
commitbb0ad11252c493ca8de85025411c3f068f529039 (patch)
tree8e05edaee5d7445512e3ef7713164210e8e6ffad /src/rt/rust.cpp
parentafd91f8a5698e7767ddfbf90c665c08dcd4f0de0 (diff)
downloadrust-bb0ad11252c493ca8de85025411c3f068f529039.tar.gz
rust-bb0ad11252c493ca8de85025411c3f068f529039.zip
rt: Call the Rust box annihilator; stop calling the cycle collector
Diffstat (limited to 'src/rt/rust.cpp')
-rw-r--r--src/rt/rust.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp
index 705a96303d4..dc28f624415 100644
--- a/src/rt/rust.cpp
+++ b/src/rt/rust.cpp
@@ -72,6 +72,8 @@ command_line_args : public kernel_owned<command_line_args>
 // FIXME (#2670): This belongs somewhere else
 int check_claims = 0;
 
+void* global_crate_map = NULL;
+
 /**
    The runtime entrypoint. The (C ABI) main function generated by rustc calls
    `rust_start`, providing the address of the Rust ABI main function, the
@@ -86,6 +88,8 @@ rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
     // line as well.
     rust_env *env = load_env();
 
+    global_crate_map = crate_map;
+
     update_gc_metadata(crate_map);
 
     update_log_settings(crate_map, env->logspec);