Skip to content

Commit ef62fae

Browse files
committed
Add a proper check for rustboot
Uncomment log initialization.
1 parent c40cf96 commit ef62fae

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/rt/rust.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,8 @@ extern "C" CDECL int
8080
rust_start(uintptr_t main_fn, rust_crate const *crate, int argc,
8181
char **argv, void* crate_map) {
8282

83-
// FIXME commented out until I figure out how to detect rustboot in a sane
84-
// way
85-
/* if (NOT_USING_RUSTBOOT)
86-
update_log_settings(crate_map, getenv("RUST_LOG"));*/
83+
if (crate->abi_tag != ABI_X86_RUSTBOOT_CDECL)
84+
update_log_settings(crate_map, getenv("RUST_LOG"));
8785
rust_srv *srv = new rust_srv();
8886
rust_kernel *kernel = new rust_kernel(srv);
8987
kernel->start();

0 commit comments

Comments
 (0)