From ef62fae9db156c1706ad08a2d2b0562fd0b9e42d Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Mon, 18 Apr 2011 19:59:22 +0200
Subject: Add a proper check for rustboot

Uncomment log initialization.
---
 src/rt/rust.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/rt/rust.cpp')

diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp
index 299f04e7939..66ca2dc2643 100644
--- a/src/rt/rust.cpp
+++ b/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();
-- 
cgit 1.4.1-3-g733a5