Merge pull request #281 from nbdd0121/link-time-panic

Fix double build of kernel.o
Rust-for-Linux · May 20, 2021 · ffdacf7 · ffdacf7
2 parents 776af46 + 5972f3e
commit ffdacf7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/rust/Makefile b/rust/Makefile
@@ -9,7 +9,9 @@ extra-$(CONFIG_RUST) += bindings_generated.rs
 obj-$(CONFIG_RUST) += alloc.o kernel.o
 extra-$(CONFIG_RUST) += exports_alloc_generated.h exports_kernel_generated.h
 
-ifndef CONFIG_RUST_BUILD_ASSERT_DENY
+ifdef CONFIG_RUST_BUILD_ASSERT_DENY
+extra-$(CONFIG_RUST) += build_error.o
+else
 obj-$(CONFIG_RUST) += build_error.o
 endif