From eed28eae387726ef7e77cc0606d693868277f0af Mon Sep 17 00:00:00 2001
From: Khyber Sen <khyber@google.com>
Date: Wed, 14 Feb 2024 10:27:07 +0000
Subject: build: add implicit `core` and `compiler_builtins` deps in the
 `#[no_std]` kernel

Similar to userspace, the `core` and `compiler_builtins` deps
are only added when `MODULE_ADD_IMPLICIT_DEPS` is true, which allows us
to avoid setting `core` as a dependency when building `core`, for example.

Test: build.py
Bug: 304850822
Change-Id: I0b613ed3084e2d2372aed2b417d9bb2fdc4d8f9a
---
 make/module.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/make/module.mk b/make/module.mk
index 8451b1e3..f52da73d 100644
--- a/make/module.mk
+++ b/make/module.mk
@@ -234,6 +234,16 @@ endif
 # concatenate them to use whichever is set
 MODULE_KERNEL_RUST_DEPS := $(MODULE_LIBRARY_DEPS) $(MODULE_LIBRARY_EXPORTED_DEPS) $(MODULE_DEPS)
 
+ifeq ($(call TOBOOL,$(MODULE_ADD_IMPLICIT_DEPS)),true)
+
+# In userspace, MODULE_ADD_IMPLICIT_DEPS adds std.
+# In the kernel, it adds core and compiler_builtins.
+MODULE_KERNEL_RUST_DEPS += \
+	trusty/user/base/lib/libcore-rust/ \
+	trusty/user/base/lib/libcompiler_builtins-rust/ \
+
+endif
+
 define READ_CRATE_INFO
 QUERY_MODULE := $1
 QUERY_VARIABLES := MODULE_CRATE_NAME MODULE_RUST_STEM MODULE_RUST_CRATE_TYPES
-- 
cgit v1.2.3