Skip to content

Commit 572640f

Browse files
committed
Merge tag 'x86-build-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build update from Ingo Molnar: "Make the 64-bit defconfig the x86 default for all builds, unless x86-32 is requested explicitly" * tag 'x86-build-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/build: Make 64-bit defconfig the default
2 parents 35011c6 + f9bb7f6 commit 572640f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/x86/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
# select defconfig based on actual architecture
55
ifeq ($(ARCH),x86)
6-
ifeq ($(shell uname -m),x86_64)
7-
KBUILD_DEFCONFIG := x86_64_defconfig
8-
else
6+
ifeq ($(shell uname -m | sed -e 's/i.86/i386/'),i386)
97
KBUILD_DEFCONFIG := i386_defconfig
8+
else
9+
KBUILD_DEFCONFIG := x86_64_defconfig
1010
endif
1111
else
1212
KBUILD_DEFCONFIG := $(ARCH)_defconfig

0 commit comments

Comments
 (0)