Skip to content

Commit 2d0ec4a

Browse files
t-8chnathanchance
authored andcommitted
kbuild: userprogs: avoid duplication of flags inherited from kernel
The duplication makes maintenance harder. Changes need to be done in two places and the lines will grow overly long. Use an intermediary variable instead. Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de> Reviewed-by: Nicolas Schier <n.schier@avm.de> Acked-by: Masahiro Yamada <masahiroy@kernel.org> Link: https://lore.kernel.org/r/20250813-kbuild-userprogs-bits-v1-1-2d9f7f411083@linutronix.de Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent 27758d8 commit 2d0ec4a

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,8 +1135,9 @@ LDFLAGS_vmlinux += --emit-relocs --discard-none
11351135
endif
11361136

11371137
# Align the bit size of userspace programs with the kernel
1138-
KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
1139-
KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
1138+
USERFLAGS_FROM_KERNEL := -m32 -m64 --target=%
1139+
KBUILD_USERCFLAGS += $(filter $(USERFLAGS_FROM_KERNEL), $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
1140+
KBUILD_USERLDFLAGS += $(filter $(USERFLAGS_FROM_KERNEL), $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
11401141

11411142
# userspace programs are linked via the compiler, use the correct linker
11421143
ifdef CONFIG_CC_IS_CLANG

0 commit comments

Comments
 (0)