---

yaml
---
r: 2135
b: refs/heads/master
c: ef62fae
h: refs/heads/master
i:
  2133: e0fcd35
  2131: 250e8e7
  2127: b68cfdd
v: v3

Author: marijnh

[refs]

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

trunk/src/rt/rust.cpp

@@ -80,10 +80,8 @@ extern "C" CDECL int
 rust_start(uintptr_t main_fn, rust_crate const *crate, int argc,
            char **argv, void* crate_map) {
 
-    // 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"));*/
+    if (crate->abi_tag != ABI_X86_RUSTBOOT_CDECL)
+        update_log_settings(crate_map, getenv("RUST_LOG"));
     rust_srv *srv = new rust_srv();
     rust_kernel *kernel = new rust_kernel(srv);
     kernel->start();