diff options
| author | Marijn Haverbeke <marijnh@gmail.com> | 2011-04-18 19:59:22 +0200 |
|---|---|---|
| committer | Marijn Haverbeke <marijnh@gmail.com> | 2011-04-18 19:59:49 +0200 |
| commit | ef62fae9db156c1706ad08a2d2b0562fd0b9e42d (patch) | |
| tree | 4cef78a84198401bf968bd880e38ab8a0f81e5c9 /src/rt/rust.cpp | |
| parent | c40cf9665685a5c90082506a9518773e466d6b4f (diff) | |
| download | rust-ef62fae9db156c1706ad08a2d2b0562fd0b9e42d.tar.gz rust-ef62fae9db156c1706ad08a2d2b0562fd0b9e42d.zip | |
Add a proper check for rustboot
Uncomment log initialization.
Diffstat (limited to 'src/rt/rust.cpp')
| -rw-r--r-- | src/rt/rust.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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(); |