Skip to content

Commit 5ea1721

Browse files
committed
kbuild: rename abs_objtree to abs_output
'objtree' refers to the top of the output directory of kernel builds. Rename abs_objtree to a more generic name, to better reflect its use in the context of external module builds. Signed-off-by: Masahiro Yamada <[email protected]> Reviewed-by: Nicolas Schier <[email protected]>
1 parent 214c0ee commit 5ea1721

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ __all:
4040

4141
this-makefile := $(lastword $(MAKEFILE_LIST))
4242
abs_srctree := $(realpath $(dir $(this-makefile)))
43-
abs_objtree := $(CURDIR)
43+
abs_output := $(CURDIR)
4444

4545
ifneq ($(sub_make_done),1)
4646

@@ -185,8 +185,8 @@ ifneq ($(KBUILD_OUTPUT),)
185185
# $(realpath ...) gets empty if the path does not exist. Run 'mkdir -p' first.
186186
$(shell mkdir -p "$(KBUILD_OUTPUT)")
187187
# $(realpath ...) resolves symlinks
188-
abs_objtree := $(realpath $(KBUILD_OUTPUT))
189-
$(if $(abs_objtree),,$(error failed to create output directory "$(KBUILD_OUTPUT)"))
188+
abs_output := $(realpath $(KBUILD_OUTPUT))
189+
$(if $(abs_output),,$(error failed to create output directory "$(KBUILD_OUTPUT)"))
190190
endif # ifneq ($(KBUILD_OUTPUT),)
191191

192192
ifneq ($(words $(subst :, ,$(abs_srctree))), 1)
@@ -197,7 +197,7 @@ export sub_make_done := 1
197197

198198
endif # sub_make_done
199199

200-
ifeq ($(abs_objtree),$(CURDIR))
200+
ifeq ($(abs_output),$(CURDIR))
201201
# Suppress "Entering directory ..." if we are at the final work directory.
202202
no-print-directory := --no-print-directory
203203
else
@@ -221,7 +221,7 @@ $(filter-out $(this-makefile), $(MAKECMDGOALS)) __all: __sub-make
221221

222222
# Invoke a second make in the output directory, passing relevant variables
223223
__sub-make:
224-
$(Q)$(MAKE) $(no-print-directory) -C $(abs_objtree) \
224+
$(Q)$(MAKE) $(no-print-directory) -C $(abs_output) \
225225
-f $(abs_srctree)/Makefile $(MAKECMDGOALS)
226226

227227
else # need-sub-make

0 commit comments

Comments
 (0)