mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
67d7c3023a
I added $(srctree)/ to some included Makefiles in the following commits: -3204a7fb98("kbuild: prefix $(srctree)/ to some included Makefiles") -d828563955("kbuild: do not require sub-make for separate output tree builds") They were a preparation for removing --include-dir flag. I have never thought --include-dir useful. Rather, it _is_ harmful. For example, run the following commands: $ make -s ARCH=x86 mrproper defconfig $ make ARCH=arm O=foo dtbs make[1]: Entering directory '/tmp/linux/foo' HOSTCC scripts/basic/fixdep Error: kernelrelease not valid - run 'make prepare' to update it UPD include/config/kernel.release make[1]: Leaving directory '/tmp/linux/foo' The first command configures the source tree for x86. The next command tries to build ARM device trees in the separate foo/ directory - this must stop because the directory foo/ has not been configured yet. However, due to --include-dir=$(abs_srctree), the top Makefile includes the wrong include/config/auto.conf from the source tree and continues building. Kbuild traverses the directory tree, but of course it does not work correctly. The Error message is also pointless - 'make prepare' does not help at all for fixing the issue. This commit fixes more arch Makefile, and finally removes --include-dir from the top Makefile. There are more breakages under drivers/, but I do not volunteer to fix them all. I just moved --include-dir to drivers/Makefile. With this commit, the second command will stop with a sensible message. $ make -s ARCH=x86 mrproper defconfig $ make ARCH=arm O=foo dtbs make[1]: Entering directory '/tmp/linux/foo' SYNC include/config/auto.conf.cmd *** *** The source tree is not clean, please run 'make ARCH=arm mrproper' *** in /tmp/linux *** make[2]: *** [../Makefile:646: outputmakefile] Error 1 /tmp/linux/Makefile:770: include/config/auto.conf.cmd: No such file or directory make[1]: *** [/tmp/linux/Makefile:793: include/config/auto.conf.cmd] Error 2 make[1]: Leaving directory '/tmp/linux/foo' make: *** [Makefile:226: __sub-make] Error 2 Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
51 lines
1.3 KiB
Makefile
51 lines
1.3 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
#
|
|
|
|
ifeq ($(CONFIG_X86_32),y)
|
|
BITS := 32
|
|
else
|
|
BITS := 64
|
|
endif
|
|
|
|
obj-y = bugs_$(BITS).o delay.o fault.o ldt.o \
|
|
ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal.o \
|
|
stub_$(BITS).o stub_segv.o \
|
|
sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o \
|
|
mem_$(BITS).o subarch.o os-$(OS)/
|
|
|
|
ifeq ($(CONFIG_X86_32),y)
|
|
|
|
obj-y += checksum_32.o syscalls_32.o
|
|
obj-$(CONFIG_ELF_CORE) += elfcore.o
|
|
|
|
subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o
|
|
subarch-y += ../lib/cmpxchg8b_emu.o ../lib/atomic64_386_32.o
|
|
subarch-y += ../kernel/sys_ia32.o
|
|
|
|
else
|
|
|
|
obj-y += syscalls_64.o vdso/
|
|
|
|
subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o \
|
|
../lib/memmove_64.o ../lib/memset_64.o
|
|
subarch-$(CONFIG_PREEMPTION) += ../entry/thunk_64.o
|
|
|
|
endif
|
|
|
|
subarch-$(CONFIG_MODULES) += ../kernel/module.o
|
|
|
|
USER_OBJS := bugs_$(BITS).o ptrace_user.o fault.o
|
|
|
|
$(obj)/user-offsets.s: c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) \
|
|
-Iarch/x86/include/generated
|
|
targets += user-offsets.s
|
|
|
|
include/generated/user_constants.h: $(obj)/user-offsets.s FORCE
|
|
$(call filechk,offsets,__USER_CONSTANT_H__)
|
|
|
|
UNPROFILE_OBJS := stub_segv.o
|
|
CFLAGS_stub_segv.o := $(CFLAGS_NO_HARDENING)
|
|
|
|
include $(srctree)/arch/um/scripts/Makefile.rules
|