Commit 88de91cc authored by Miguel Ojeda's avatar Miguel Ojeda
Browse files

rust: quote: enable support in kbuild 



With all the new files in place and ready from the new crate, enable
the support for it in the build system.

Reviewed-by: default avatarAlice Ryhl <aliceryhl@google.com>
Reviewed-by: default avatarGary Guo <gary@garyguo.net>
Tested-by: default avatarGary Guo <gary@garyguo.net>
Tested-by: default avatarJesung Yang <y.j3ms.n@gmail.com>
Link: https://patch.msgid.link/20251124151837.2184382-15-ojeda@kernel.org


Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 51177f02

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1834,6 +1834,7 @@ rustfmt: 
	$(Q)find $(srctree) $(RCS_FIND_IGNORE) \

		\( \

			-path $(srctree)/rust/proc-macro2 \

			-o -path $(srctree)/rust/quote \

		\) -prune -o \

		-type f -a -name '*.rs' -a ! -name '*generated*' -print \

		| xargs $(RUSTFMT) $(rustfmt_flags)

rust/Makefile

+35 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ endif 


obj-$(CONFIG_RUST) += exports.o



always-$(CONFIG_RUST) += libproc_macro2.rlib

always-$(CONFIG_RUST) += libproc_macro2.rlib libquote.rlib



always-$(CONFIG_RUST_KERNEL_DOCTESTS) += doctests_kernel_generated.rs

always-$(CONFIG_RUST_KERNEL_DOCTESTS) += doctests_kernel_generated_kunit.c
@@ -89,6 +89,18 @@ proc_macro2-flags := \ 
    -Zcrate-attr='feature(proc_macro_byte_character,proc_macro_c_str_literals)' \

    $(call cfgs-to-flags,$(proc_macro2-cfgs))



quote-cfgs := \

    feature="proc-macro"



quote-skip_flags := \

    --edition=2021



quote-flags := \

    --edition=2018 \

    --cap-lints=allow \

    --extern proc_macro2 \

    $(call cfgs-to-flags,$(quote-cfgs))



# `rustdoc` did not save the target modifiers, thus workaround for

# the time being (https://github.com/rust-lang/rust/issues/144521).

rustdoc_modifiers_workaround := $(if $(call rustc-min-version,108800),-Cunsafe-allow-abi-mismatch=fixed-x18)
@@ -143,10 +155,17 @@ rustdoc-proc_macro2: private rustc_target_flags = $(proc_macro2-flags) 
rustdoc-proc_macro2: $(src)/proc-macro2/lib.rs rustdoc-clean FORCE

	+$(call if_changed,rustdoc)



rustdoc-quote: private rustdoc_host = yes

rustdoc-quote: private rustc_target_flags = $(quote-flags)

rustdoc-quote: private skip_flags = $(quote-skip_flags)

rustdoc-quote: $(src)/quote/lib.rs rustdoc-clean rustdoc-proc_macro2 FORCE

	+$(call if_changed,rustdoc)



rustdoc-macros: private rustdoc_host = yes

rustdoc-macros: private rustc_target_flags = --crate-type proc-macro \

    --extern proc_macro

rustdoc-macros: $(src)/macros/lib.rs rustdoc-clean rustdoc-proc_macro2 FORCE

rustdoc-macros: $(src)/macros/lib.rs rustdoc-clean rustdoc-proc_macro2 \

    rustdoc-quote FORCE

	+$(call if_changed,rustdoc)



# Starting with Rust 1.82.0, skipping `-Wrustdoc::unescaped_backticks` should
@@ -207,6 +226,11 @@ rusttestlib-proc_macro2: private rustc_target_flags = $(proc_macro2-flags) 
rusttestlib-proc_macro2: $(src)/proc-macro2/lib.rs FORCE

	+$(call if_changed,rustc_test_library)



rusttestlib-quote: private skip_flags = $(quote-skip_flags)

rusttestlib-quote: private rustc_target_flags = $(quote-flags)

rusttestlib-quote: $(src)/quote/lib.rs rusttestlib-proc_macro2 FORCE

	+$(call if_changed,rustc_test_library)



rusttestlib-macros: private rustc_target_flags = --extern proc_macro

rusttestlib-macros: private rustc_test_library_proc = yes

rusttestlib-macros: $(src)/macros/lib.rs FORCE
@@ -458,6 +482,12 @@ $(obj)/libproc_macro2.rlib: private rustc_target_flags = $(proc_macro2-flags) 
$(obj)/libproc_macro2.rlib: $(src)/proc-macro2/lib.rs FORCE

	+$(call if_changed_dep,rustc_procmacrolibrary)



$(obj)/libquote.rlib: private skip_clippy = 1

$(obj)/libquote.rlib: private skip_flags = $(quote-skip_flags)

$(obj)/libquote.rlib: private rustc_target_flags = $(quote-flags)

$(obj)/libquote.rlib: $(src)/quote/lib.rs $(obj)/libproc_macro2.rlib FORCE

	+$(call if_changed_dep,rustc_procmacrolibrary)



quiet_cmd_rustc_procmacro = $(RUSTC_OR_CLIPPY_QUIET) P $@

      cmd_rustc_procmacro = \

	$(RUSTC_OR_CLIPPY) $(rust_common_flags) $(rustc_target_flags) \
@@ -469,7 +499,8 @@ quiet_cmd_rustc_procmacro = $(RUSTC_OR_CLIPPY_QUIET) P $@ 
		@$(objtree)/include/generated/rustc_cfg $<



# Procedural macros can only be used with the `rustc` that compiled it.

$(obj)/$(libmacros_name): $(src)/macros/lib.rs $(obj)/libproc_macro2.rlib FORCE

$(obj)/$(libmacros_name): $(src)/macros/lib.rs $(obj)/libproc_macro2.rlib \

    $(obj)/libquote.rlib FORCE

	+$(call if_changed_dep,rustc_procmacro)



$(obj)/$(libpin_init_internal_name): private rustc_target_flags = --cfg kernel
@@ -493,6 +524,7 @@ rust-analyzer: 
	$(Q)MAKEFLAGS= $(srctree)/scripts/generate_rust_analyzer.py \

		--cfgs='core=$(core-cfgs)' $(core-edition) \

		--cfgs='proc_macro2=$(proc_macro2-cfgs)' \

		--cfgs='quote=$(quote-cfgs)' \

		$(realpath $(srctree)) $(realpath $(objtree)) \

		$(rustc_sysroot) $(RUST_LIB_SRC) $(if $(KBUILD_EXTMOD),$(srcroot)) \

		> rust-project.json

scripts/generate_rust_analyzer.py

+7 −0
Original line number Diff line number Diff line
@@ -93,6 +93,13 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit 
        cfg=crates_cfgs["proc_macro2"],

    )



    append_crate(

        "quote",

        srctree / "rust" / "quote" / "lib.rs",

        ["alloc", "proc_macro", "proc_macro2"],

        cfg=crates_cfgs["quote"],

    )



    append_crate(

        "macros",

        srctree / "rust" / "macros" / "lib.rs",