Skip to content

Commit 5bb52ee

Browse files
authored
Merge pull request thesofproject#116 from Rust-for-Linux/compile-test
Preparation for linux-next
2 parents 0213306 + 55b1815 commit 5bb52ee

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,11 @@ export MODORDER := $(extmod-prefix)modules.order
12081208
export MODULES_NSDEPS := $(extmod-prefix)modules.nsdeps
12091209

12101210
ifeq ($(KBUILD_EXTMOD),)
1211-
core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ rust/
1211+
core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/
1212+
1213+
ifdef CONFIG_RUST
1214+
core-y += rust/
1215+
endif
12121216

12131217
vmlinux-dirs := $(patsubst %/,%,$(filter %/, \
12141218
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
@@ -1310,7 +1314,9 @@ archprepare: outputmakefile archheaders archscripts scripts include/config/kerne
13101314
prepare0: archprepare
13111315
$(Q)$(MAKE) $(build)=scripts/mod
13121316
$(Q)$(MAKE) $(build)=.
1317+
ifdef CONFIG_RUST
13131318
$(Q)$(MAKE) $(build)=rust
1319+
endif
13141320

13151321
# All the preparing..
13161322
prepare: prepare0 prepare-objtool prepare-resolve_btfids

init/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,6 +2039,7 @@ config PROFILING
20392039
config RUST
20402040
bool "Rust support"
20412041
depends on HAS_RUST
2042+
depends on !COMPILE_TEST
20422043
default n
20432044
help
20442045
Enables Rust support in the kernel.

0 commit comments

Comments
 (0)