diff options
| author | Marijn Haverbeke <[email protected]> | 2011-04-18 18:29:20 +0200 |
|---|---|---|
| committer | Marijn Haverbeke <[email protected]> | 2011-04-18 18:29:20 +0200 |
| commit | c40cf9665685a5c90082506a9518773e466d6b4f (patch) | |
| tree | 7c5849b92b6f849be2ffb88c5f1bb1a8ce20a750 /src | |
| parent | Update foregoing patches to leave rust_crate alone. (diff) | |
| download | rust-c40cf9665685a5c90082506a9518773e466d6b4f.tar.xz rust-c40cf9665685a5c90082506a9518773e466d6b4f.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rt/rust.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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(); |