Commit e174dd14 authored by Gary Guo's avatar Gary Guo Committed by Miguel Ojeda
Browse files

rust: kbuild: emit dep-info into $(depfile) directly 



After commit 295d8398 ("kbuild: specify output names separately for
each emission type from rustc"), the preferred pattern is to ask rustc to
emit dependency information into $(depfile) directly, and after commit
2185242f ("kbuild: remove sed commands after rustc rules"), the
post-processing to remove comments is no longer necessary as fixdep can
handle comments directly. Thus, emit dep-info into $(depfile) directly and
remove the mv and sed invocation.

This fixes the issue where a non-ignored .d file is emitted during
compilation and removed shortly afterwards.

[ Like Gary mentioned in Zulip, this likely happened due to rebasing
  the builds part of the old `syn` work I had. - Miguel ]

Reported-by: default avatarOnur Özkan <work@onurozkan.dev>
Closes: https://rust-for-linux.zulipchat.com/#narrow/channel/288089-General/topic/syn.20artifact.20being.20tracked.20by.20git/with/575467879


Fixes: 7dbe46c0 ("rust: kbuild: add proc macro library support")
Signed-off-by: default avatarGary Guo <gary@garyguo.net>
Tested-by: default avatarOnur Özkan <work@onurozkan.dev>
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20260224072957.214979-1-gary@garyguo.net


[ Reworded for a couple of typos. - Miguel ]
Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 3ac88a99

rust/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -526,11 +526,9 @@ quiet_cmd_rustc_procmacrolibrary = $(RUSTC_OR_CLIPPY_QUIET) PL $@ 
      cmd_rustc_procmacrolibrary = \

	$(if $(skip_clippy),$(RUSTC),$(RUSTC_OR_CLIPPY)) \

		$(filter-out $(skip_flags),$(rust_common_flags) $(rustc_target_flags)) \

		--emit=dep-info,link --crate-type rlib -O \

		--emit=dep-info=$(depfile) --emit=link=$@ --crate-type rlib -O \

		--out-dir $(objtree)/$(obj) -L$(objtree)/$(obj) \

		--crate-name $(patsubst lib%.rlib,%,$(notdir $@)) $<; \

	mv $(objtree)/$(obj)/$(patsubst lib%.rlib,%,$(notdir $@)).d $(depfile); \

	sed -i '/^\#/d' $(depfile)

		--crate-name $(patsubst lib%.rlib,%,$(notdir $@)) $<



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

$(obj)/libproc_macro2.rlib: private rustc_target_flags = $(proc_macro2-flags)