diff options
| -rw-r--r-- | dev/virtio/vsock-rust/rules.mk | 1 | ||||
| -rw-r--r-- | make/rust-toplevel.mk | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/dev/virtio/vsock-rust/rules.mk b/dev/virtio/vsock-rust/rules.mk index c15e9291..1cb9ac35 100644 --- a/dev/virtio/vsock-rust/rules.mk +++ b/dev/virtio/vsock-rust/rules.mk @@ -6,7 +6,6 @@ MODULE_SRCS := \ MODULE_LIBRARY_DEPS := \ trusty/user/base/lib/liballoc-rust \ - trusty/user/base/lib/libpanic_abort-rust \ trusty/user/base/lib/trusty-std \ external/rust/crates/virtio-drivers \ diff --git a/make/rust-toplevel.mk b/make/rust-toplevel.mk index 98d870df..f2f48182 100644 --- a/make/rust-toplevel.mk +++ b/make/rust-toplevel.mk @@ -39,9 +39,8 @@ WRAPPER_RUSTFLAGS += $(addprefix --extern ,$(WRAPPER_RUST_EXTERN_PATHS)) # generate a .rs source file for the wrapper crate # we must not explicitly "extern crate" core or compiler_builtins CRATES_TO_IMPORT := $(filter-out core compiler_builtins,$(ALL_KERNEL_HOST_CRATE_STEMS) $(ALLMODULE_CRATE_STEMS_SORTED)) -RUST_WRAPPER_SRC := \#![feature(panic_abort)] \#![no_std] \ - $(foreach crate, $(CRATES_TO_IMPORT), extern crate $(subst .,_,$(crate));) \ - \#[panic_handler] fn handle_panic(_: &core::panic::PanicInfo) -> ! {loop {}} +RUST_WRAPPER_SRC := \#![no_std] \ + $(foreach crate, $(CRATES_TO_IMPORT), extern crate $(subst .,_,$(crate));) RUST_WRAPPER := $(BUILDDIR)/lk-crates.rs |