diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 18:36:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 18:36:54 -0800 |
| commit | 572640f0c0d6c681104880090dc0560b69c9d0e6 (patch) | |
| tree | a5db2a1f80d50ac964304318b0ee085f7fe78b37 | |
| parent | 35011c67c8b7ff96c4e2dd892099ba643f9ae11e (diff) | |
| parent | f9bb7f6a7eb0efd282f7364115f97e652677a29b (diff) | |
| download | linux-572640f0c0d6c681104880090dc0560b69c9d0e6.tar.gz | |
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
| -rw-r--r-- | arch/x86/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 73ed982d410000..b39975977c037c 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -3,10 +3,10 @@ # select defconfig based on actual architecture ifeq ($(ARCH),x86) - ifeq ($(shell uname -m),x86_64) - KBUILD_DEFCONFIG := x86_64_defconfig - else + ifeq ($(shell uname -m | sed -e 's/i.86/i386/'),i386) KBUILD_DEFCONFIG := i386_defconfig + else + KBUILD_DEFCONFIG := x86_64_defconfig endif else KBUILD_DEFCONFIG := $(ARCH)_defconfig |