Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 051f278e authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: replace KBUILD_SRCTREE with boolean building_out_of_srctree 



Commit 25b146c5 ("kbuild: allow Kbuild to start from any directory")
deprecated KBUILD_SRCTREE.

It is only used in tools/testing/selftest/ to distinguish out-of-tree
build. Replace it with a new boolean flag, building_out_of_srctree.

I also replaced the conditional ($(srctree),.) because the next commit
will allow an absolute path to be used for $(srctree) even when building
in the source tree.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 75dd4747

Makefile

+8 −11
Original line number Diff line number Diff line
@@ -228,9 +228,12 @@ ifeq ("$(origin M)", "command line") 
  KBUILD_EXTMOD := $(M)

endif



export KBUILD_CHECKSRC KBUILD_EXTMOD



ifeq ($(abs_srctree),$(abs_objtree))

        # building in the source tree

        srctree := .

	building_out_of_srctree :=

else

        ifeq ($(abs_srctree)/,$(dir $(abs_objtree)))

                # building in a subdirectory of the source tree
@@ -238,19 +241,13 @@ else 
        else

                srctree := $(abs_srctree)

        endif



	# TODO:

	# KBUILD_SRC is only used to distinguish in-tree/out-of-tree build.

	# Replace it with $(srctree) or something.

	KBUILD_SRC := $(abs_srctree)

	building_out_of_srctree := 1

endif



export KBUILD_CHECKSRC KBUILD_EXTMOD KBUILD_SRC



objtree		:= .

VPATH		:= $(srctree)



export srctree objtree VPATH

export building_out_of_srctree srctree objtree VPATH



# To make sure we do not include .config for any of the *config targets

# catch them early, and hand them over to scripts/kconfig/Makefile
@@ -453,7 +450,7 @@ USERINCLUDE := \ 
LINUXINCLUDE    := \

		-I$(srctree)/arch/$(SRCARCH)/include \

		-I$(objtree)/arch/$(SRCARCH)/include/generated \

		$(if $(filter .,$(srctree)),,-I$(srctree)/include) \

		$(if $(building_out_of_srctree),-I$(srctree)/include) \

		-I$(objtree)/include \

		$(USERINCLUDE)
@@ -514,7 +511,7 @@ PHONY += outputmakefile 
# At the same time when output Makefile generated, generate .gitignore to

# ignore whole output directory

outputmakefile:

ifneq ($(srctree),.)

ifdef building_out_of_srctree

	$(Q)ln -fsn $(srctree) source

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree)

	$(Q)test -e .gitignore || \
@@ -1101,7 +1098,7 @@ PHONY += prepare archprepare prepare1 prepare3 
# and if so do:

# 1) Check that make has not been executed in the kernel src $(srctree)

prepare3: include/config/kernel.release

ifneq ($(srctree),.)

ifdef building_out_of_srctree

	@$(kecho) '  Using $(srctree) as source for kernel'

	$(Q)if [ -f $(srctree)/.config -o \

		 -d $(srctree)/include/config -o \

scripts/Makefile.build

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ existing-targets := $(wildcard $(sort $(targets))) 


-include $(foreach f,$(existing-targets),$(dir $(f)).$(notdir $(f)).cmd)



ifneq ($(srctree),.)

ifdef building_out_of_srctree

# Create directories for object files if they do not exist

obj-dirs := $(sort $(obj) $(patsubst %/,%, $(dir $(targets))))

# If targets exist, their directories apparently exist. Skip mkdir.

scripts/Makefile.host

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ _hostcxx_flags = $(KBUILD_HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ 


# $(objtree)/$(obj) for including generated headers from checkin source files

ifeq ($(KBUILD_EXTMOD),)

ifneq ($(srctree),.)

ifdef building_out_of_srctree

_hostc_flags   += -I $(objtree)/$(obj)

_hostcxx_flags += -I $(objtree)/$(obj)

endif

scripts/Makefile.lib

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ endif 
# $(srctree)/$(src) for including checkin headers from generated source files

# $(objtree)/$(obj) for including generated headers from checkin source files

ifeq ($(KBUILD_EXTMOD),)

ifneq ($(srctree),.)

ifdef building_out_of_srctree

_c_flags   += -I $(srctree)/$(src) -I $(objtree)/$(obj)

_a_flags   += -I $(srctree)/$(src) -I $(objtree)/$(obj)

_cpp_flags += -I $(srctree)/$(src) -I $(objtree)/$(obj)

scripts/Makefile.modbuiltin

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ include include/config/tristate.conf 


include scripts/Kbuild.include



ifneq ($(srctree),.)

ifdef building_out_of_srctree

# Create output directory if not already present

_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))

endif