mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 22:21:42 +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>
66 lines
2.1 KiB
Makefile
66 lines
2.1 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux,intel}.com)
|
|
#
|
|
|
|
# Don't instrument UML-specific code; without this, we may crash when
|
|
# accessing the instrumentation buffer for the first time from the
|
|
# kernel.
|
|
KCOV_INSTRUMENT := n
|
|
|
|
CPPFLAGS_vmlinux.lds := -DSTART=$(LDS_START) \
|
|
-DELF_ARCH=$(LDS_ELF_ARCH) \
|
|
-DELF_FORMAT=$(LDS_ELF_FORMAT) \
|
|
$(LDS_EXTRA)
|
|
extra-y := vmlinux.lds
|
|
|
|
obj-y = config.o exec.o exitcode.o irq.o ksyms.o mem.o \
|
|
physmem.o process.o ptrace.o reboot.o sigio.o \
|
|
signal.o sysrq.o time.o tlb.o trap.o \
|
|
um_arch.o umid.o maccess.o kmsg_dump.o capflags.o skas/
|
|
obj-y += load_file.o
|
|
|
|
obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
|
|
obj-$(CONFIG_GPROF) += gprof_syms.o
|
|
obj-$(CONFIG_OF) += dtb.o
|
|
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
|
obj-$(CONFIG_STACKTRACE) += stacktrace.o
|
|
obj-$(CONFIG_GENERIC_PCI_IOMAP) += ioport.o
|
|
|
|
USER_OBJS := config.o
|
|
|
|
include $(srctree)/arch/um/scripts/Makefile.rules
|
|
|
|
targets := config.c config.tmp capflags.c
|
|
|
|
# Be careful with the below Sed code - sed is pitfall-rich!
|
|
# We use sed to lower build requirements, for "embedded" builders for instance.
|
|
|
|
$(obj)/config.tmp: $(objtree)/.config FORCE
|
|
$(call if_changed,quote1)
|
|
|
|
quiet_cmd_quote1 = QUOTE $@
|
|
cmd_quote1 = sed -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/\\n",/' \
|
|
$< > $@
|
|
|
|
$(obj)/config.c: $(src)/config.c.in $(obj)/config.tmp FORCE
|
|
$(call if_changed,quote2)
|
|
|
|
quiet_cmd_mkcapflags = MKCAP $@
|
|
cmd_mkcapflags = $(CONFIG_SHELL) $(srctree)/$(src)/../../x86/kernel/cpu/mkcapflags.sh $@ $^
|
|
|
|
cpufeature = $(src)/../../x86/include/asm/cpufeatures.h
|
|
vmxfeature = $(src)/../../x86/include/asm/vmxfeatures.h
|
|
|
|
$(obj)/capflags.c: $(cpufeature) $(vmxfeature) $(src)/../../x86/kernel/cpu/mkcapflags.sh FORCE
|
|
$(call if_changed,mkcapflags)
|
|
|
|
quiet_cmd_quote2 = QUOTE $@
|
|
cmd_quote2 = sed -e '/CONFIG/{' \
|
|
-e 's/"CONFIG"//' \
|
|
-e 'r $(obj)/config.tmp' \
|
|
-e 'a \' \
|
|
-e '""' \
|
|
-e '}' \
|
|
$< > $@
|