From c40cf9665685a5c90082506a9518773e466d6b4f Mon Sep 17 00:00:00 2001 From: Marijn Haverbeke Date: Mon, 18 Apr 2011 18:29:20 +0200 Subject: Temporarily turn off logging initialization Will be restored as soon as I find a way for the runtime to figure out whether it is on rustboot or rustc. --- src/rt/rust.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/rt/rust.cpp') diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp index 6a421736..299f04e7 100644 --- a/src/rt/rust.cpp +++ b/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(); -- cgit v1.2.3