Skip to content

Commit 52ba807

Browse files
committed
rust: macros: support proc-macro2, quote and syn
One of the two main uses cases for adding `proc-macro2`, `quote` and `syn` is the `macros` crates (and the other `pin-init`). Thus add the support for the crates in `macros` already. Tested-by: Jesung Yang <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Miguel Ojeda <[email protected]>
1 parent 7374017 commit 52ba807

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

rust/Makefile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ rustdoc-syn: $(src)/syn/lib.rs rustdoc-clean rustdoc-quote FORCE
184184

185185
rustdoc-macros: private rustdoc_host = yes
186186
rustdoc-macros: private rustc_target_flags = --crate-type proc-macro \
187-
--extern proc_macro
187+
--extern proc_macro --extern proc_macro2 --extern quote --extern syn
188188
rustdoc-macros: $(src)/macros/lib.rs rustdoc-clean rustdoc-proc_macro2 \
189189
rustdoc-quote rustdoc-syn FORCE
190190
+$(call if_changed,rustdoc)
@@ -256,9 +256,11 @@ rusttestlib-syn: private rustc_target_flags = $(syn-flags)
256256
rusttestlib-syn: $(src)/syn/lib.rs rusttestlib-quote FORCE
257257
+$(call if_changed,rustc_test_library)
258258

259-
rusttestlib-macros: private rustc_target_flags = --extern proc_macro
259+
rusttestlib-macros: private rustc_target_flags = --extern proc_macro \
260+
--extern proc_macro2 --extern quote --extern syn
260261
rusttestlib-macros: private rustc_test_library_proc = yes
261-
rusttestlib-macros: $(src)/macros/lib.rs FORCE
262+
rusttestlib-macros: $(src)/macros/lib.rs \
263+
rusttestlib-proc_macro2 rusttestlib-quote rusttestlib-syn FORCE
262264
+$(call if_changed,rustc_test_library)
263265

264266
rusttestlib-pin_init_internal: private rustc_target_flags = --cfg kernel \
@@ -339,7 +341,8 @@ quiet_cmd_rustc_test = $(RUSTC_OR_CLIPPY_QUIET) T $<
339341
rusttest: rusttest-macros
340342

341343
rusttest-macros: private rustc_target_flags = --extern proc_macro \
342-
--extern macros --extern kernel --extern pin_init
344+
--extern macros --extern kernel --extern pin_init \
345+
--extern proc_macro2 --extern quote --extern syn
343346
rusttest-macros: private rustdoc_test_target_flags = --crate-type proc-macro
344347
rusttest-macros: $(src)/macros/lib.rs \
345348
rusttestlib-macros rusttestlib-kernel rusttestlib-pin_init FORCE
@@ -529,6 +532,8 @@ quiet_cmd_rustc_procmacro = $(RUSTC_OR_CLIPPY_QUIET) P $@
529532
@$(objtree)/include/generated/rustc_cfg $<
530533

531534
# Procedural macros can only be used with the `rustc` that compiled it.
535+
$(obj)/$(libmacros_name): private rustc_target_flags = \
536+
--extern proc_macro2 --extern quote --extern syn
532537
$(obj)/$(libmacros_name): $(src)/macros/lib.rs $(obj)/libproc_macro2.rlib \
533538
$(obj)/libquote.rlib $(obj)/libsyn.rlib FORCE
534539
+$(call if_changed_dep,rustc_procmacro)

scripts/generate_rust_analyzer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def append_sysroot_crate(
110110
append_crate(
111111
"macros",
112112
srctree / "rust" / "macros" / "lib.rs",
113-
["std", "proc_macro"],
113+
["std", "proc_macro", "proc_macro2", "quote", "syn"],
114114
is_proc_macro=True,
115115
)
116116

0 commit comments

Comments
 (0)