Hi all, Today's linux-next merge of the rust tree got a conflict in: Makefile between commit: 09708df61f2b ("kbuild: split DEBUG_CFLAGS out to scripts/Makefile.debug") from the kbuild tree and commit: dc08d49444e9 ("Kbuild: add Rust support") from the rust tree. I fixed it up (I used the Makefile conflicting part from the former and applied the patch below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. Miguel, it might be worth do a back merge of v5.14 (or maybe even v5.15-rc1) to fix up the old conflicts ... If you do that, though, please don't use github's GUI to do it, do it in your own git tree, include a good commit message in the merge commit (saying why you did the merge), and push it up to git hub. From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Fri, 15 Oct 2021 18:16:09 +1100 Subject: [PATCH] Kbuild: fix for "kbuild: split DEBUG_CFLAGS out to scripts/Makefile.debug" Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- scripts/Makefile.debug | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/Makefile.debug b/scripts/Makefile.debug index 9f39b0130551..ad9308a08240 100644 --- a/scripts/Makefile.debug +++ b/scripts/Makefile.debug @@ -1,4 +1,5 @@ DEBUG_CFLAGS := +DEBUG_RUSTFLAGS := ifdef CONFIG_DEBUG_INFO_SPLIT DEBUG_CFLAGS += -gsplit-dwarf @@ -8,6 +9,11 @@ endif ifndef CONFIG_AS_IS_LLVM KBUILD_AFLAGS += -Wa,-gdwarf-2 +ifdef CONFIG_DEBUG_INFO_REDUCED +DEBUG_RUSTFLAGS += -Cdebuginfo=1 +else +DEBUG_RUSTFLAGS += -Cdebuginfo=2 +endif endif ifndef CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT @@ -31,3 +37,6 @@ endif KBUILD_CFLAGS += $(DEBUG_CFLAGS) export DEBUG_CFLAGS + +KBUILD_RUSTFLAGS += $(DEBUG_RUSTFLAGS) +export DEBUG_RUSTFLAGS -- 2.33.0 -- Cheers, Stephen Rothwell
Attachment:
pgpMzeWFpxAJG.pgp
Description: OpenPGP digital signature