---

yaml
---
r: 2134
b: refs/heads/master
c: c40cf96
h: refs/heads/master
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6be25a8705b40c2c5127b52479485d904d38b64
+refs/heads/master: c40cf9665685a5c90082506a9518773e466d6b4f

trunk/src/rt/rust.cpp

@@ -80,9 +80,10 @@ extern "C" CDECL int
 rust_start(uintptr_t main_fn, rust_crate const *crate, int argc,
            char **argv, void* crate_map) {
 
-    // Only when we're on rustc is the last argument passed
-    if (!crate->get_image_base())
-        update_log_settings(crate_map, getenv("RUST_LOG"));
+    // FIXME commented out until I figure out how to detect rustboot in a sane
+    // way
+    /* if (NOT_USING_RUSTBOOT)
+          update_log_settings(crate_map, getenv("RUST_LOG"));*/
     rust_srv *srv = new rust_srv();
     rust_kernel *kernel = new rust_kernel(srv);
     kernel->start();