From 5ecb6a537464bdcea5624203654f74a770d943b5 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Wed, 20 Nov 2024 14:06:50 +0000 Subject: [PATCH] Revert "FROMLIST: rust: add PROCMACROLDFLAGS" This reverts commit 5ff498e7bc1e5f1427ee4e86c34d58f38baafa43. Change-Id: I5ba3348d1cca052c7312489904dcab0c66bf6b45 Signed-off-by: Alice Ryhl --- Documentation/kbuild/kbuild.rst | 7 ------- Makefile | 1 - rust/Makefile | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Documentation/kbuild/kbuild.rst b/Documentation/kbuild/kbuild.rst index f7b30ae9cac2..74f2c42da6d1 100644 --- a/Documentation/kbuild/kbuild.rst +++ b/Documentation/kbuild/kbuild.rst @@ -96,13 +96,6 @@ HOSTRUSTFLAGS ------------- Additional flags to be passed to $(HOSTRUSTC) when building host programs. -PROCMACROLDFLAGS -------------- -Additional flags to be passed when linking Rust proc macros. Since proc macros -are loaded by rustc at build time, they must be linked in a way that is -compatible with the rustc toolchain being used. If unset, it defaults to -$(HOSTLDFLAGS). - HOSTLDFLAGS ----------- Additional flags to be passed when linking host programs. diff --git a/Makefile b/Makefile index 3aab3eede1cc..2c33fbafd59e 100644 --- a/Makefile +++ b/Makefile @@ -483,7 +483,6 @@ KBUILD_HOSTCXXFLAGS := -Wall -O2 $(HOST_LFS_CFLAGS) $(HOSTCXXFLAGS) \ -I $(srctree)/scripts/include KBUILD_HOSTRUSTFLAGS := $(rust_common_flags) -O -Cstrip=debuginfo \ -Zallow-features= $(HOSTRUSTFLAGS) -KBUILD_PROCMACROLDFLAGS := $(or $(PROCMACROLDFLAGS),$(HOSTLDFLAGS)) KBUILD_HOSTLDFLAGS := $(HOST_LFS_LDFLAGS) $(HOSTLDFLAGS) KBUILD_HOSTLDLIBS := $(HOST_LFS_LIBS) $(HOSTLDLIBS) diff --git a/rust/Makefile b/rust/Makefile index 3cd4dba4e1b6..b5e0a73b78f3 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -336,7 +336,7 @@ quiet_cmd_rustc_procmacro = $(RUSTC_OR_CLIPPY_QUIET) P $@ cmd_rustc_procmacro = \ $(RUSTC_OR_CLIPPY) $(rust_common_flags) \ -Clinker-flavor=gcc -Clinker=$(HOSTCC) \ - -Clink-args='$(call escsq,$(KBUILD_PROCMACROLDFLAGS))' \ + -Clink-args='$(call escsq,$(KBUILD_HOSTLDFLAGS))' \ --emit=dep-info=$(depfile) --emit=link=$@ --extern proc_macro \ --crate-type proc-macro \ --crate-name $(patsubst lib%.so,%,$(notdir $@)) $<