mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
kbuild: handle C=... and M=... after entering into build directory
This commit avoids processing C=... and M=... twice when O=... is also given. Besides, we can also remove KBUILD_EXTMOD="$(KBUILD_EXTMOD)" in the sub-make target. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Peter Foley <pefoley2@pefoley.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
parent
745a254322
commit
aa55c8e2f7
60
Makefile
60
Makefile
|
@ -95,34 +95,6 @@ endif
|
||||||
|
|
||||||
export quiet Q KBUILD_VERBOSE
|
export quiet Q KBUILD_VERBOSE
|
||||||
|
|
||||||
# Call a source code checker (by default, "sparse") as part of the
|
|
||||||
# C compilation.
|
|
||||||
#
|
|
||||||
# Use 'make C=1' to enable checking of only re-compiled files.
|
|
||||||
# Use 'make C=2' to enable checking of *all* source files, regardless
|
|
||||||
# of whether they are re-compiled or not.
|
|
||||||
#
|
|
||||||
# See the file "Documentation/sparse.txt" for more details, including
|
|
||||||
# where to get the "sparse" utility.
|
|
||||||
|
|
||||||
ifeq ("$(origin C)", "command line")
|
|
||||||
KBUILD_CHECKSRC = $(C)
|
|
||||||
endif
|
|
||||||
ifndef KBUILD_CHECKSRC
|
|
||||||
KBUILD_CHECKSRC = 0
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Use make M=dir to specify directory of external module to build
|
|
||||||
# Old syntax make ... SUBDIRS=$PWD is still supported
|
|
||||||
# Setting the environment variable KBUILD_EXTMOD take precedence
|
|
||||||
ifdef SUBDIRS
|
|
||||||
KBUILD_EXTMOD ?= $(SUBDIRS)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ("$(origin M)", "command line")
|
|
||||||
KBUILD_EXTMOD := $(M)
|
|
||||||
endif
|
|
||||||
|
|
||||||
# kbuild supports saving output files in a separate directory.
|
# kbuild supports saving output files in a separate directory.
|
||||||
# To locate output files in a separate directory two syntaxes are supported.
|
# To locate output files in a separate directory two syntaxes are supported.
|
||||||
# In both cases the working directory must be the root of the kernel src.
|
# In both cases the working directory must be the root of the kernel src.
|
||||||
|
@ -138,7 +110,6 @@ endif
|
||||||
# The O= assignment takes precedence over the KBUILD_OUTPUT environment
|
# The O= assignment takes precedence over the KBUILD_OUTPUT environment
|
||||||
# variable.
|
# variable.
|
||||||
|
|
||||||
|
|
||||||
# KBUILD_SRC is set on invocation of make in OBJ directory
|
# KBUILD_SRC is set on invocation of make in OBJ directory
|
||||||
# KBUILD_SRC is not intended to be used by the regular user (for now)
|
# KBUILD_SRC is not intended to be used by the regular user (for now)
|
||||||
ifeq ($(KBUILD_SRC),)
|
ifeq ($(KBUILD_SRC),)
|
||||||
|
@ -172,8 +143,7 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
|
||||||
|
|
||||||
sub-make: FORCE
|
sub-make: FORCE
|
||||||
$(Q)$(MAKE) -C $(KBUILD_OUTPUT) KBUILD_SRC=$(CURDIR) \
|
$(Q)$(MAKE) -C $(KBUILD_OUTPUT) KBUILD_SRC=$(CURDIR) \
|
||||||
KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile \
|
-f $(CURDIR)/Makefile $(filter-out _all sub-make,$(MAKECMDGOALS))
|
||||||
$(filter-out _all sub-make,$(MAKECMDGOALS))
|
|
||||||
|
|
||||||
# Leave processing to above invocation of make
|
# Leave processing to above invocation of make
|
||||||
skip-makefile := 1
|
skip-makefile := 1
|
||||||
|
@ -188,6 +158,34 @@ ifeq ($(skip-makefile),)
|
||||||
# so that IDEs/editors are able to understand relative filenames.
|
# so that IDEs/editors are able to understand relative filenames.
|
||||||
MAKEFLAGS += --no-print-directory
|
MAKEFLAGS += --no-print-directory
|
||||||
|
|
||||||
|
# Call a source code checker (by default, "sparse") as part of the
|
||||||
|
# C compilation.
|
||||||
|
#
|
||||||
|
# Use 'make C=1' to enable checking of only re-compiled files.
|
||||||
|
# Use 'make C=2' to enable checking of *all* source files, regardless
|
||||||
|
# of whether they are re-compiled or not.
|
||||||
|
#
|
||||||
|
# See the file "Documentation/sparse.txt" for more details, including
|
||||||
|
# where to get the "sparse" utility.
|
||||||
|
|
||||||
|
ifeq ("$(origin C)", "command line")
|
||||||
|
KBUILD_CHECKSRC = $(C)
|
||||||
|
endif
|
||||||
|
ifndef KBUILD_CHECKSRC
|
||||||
|
KBUILD_CHECKSRC = 0
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Use make M=dir to specify directory of external module to build
|
||||||
|
# Old syntax make ... SUBDIRS=$PWD is still supported
|
||||||
|
# Setting the environment variable KBUILD_EXTMOD take precedence
|
||||||
|
ifdef SUBDIRS
|
||||||
|
KBUILD_EXTMOD ?= $(SUBDIRS)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ("$(origin M)", "command line")
|
||||||
|
KBUILD_EXTMOD := $(M)
|
||||||
|
endif
|
||||||
|
|
||||||
# If building an external module we do not care about the all: rule
|
# If building an external module we do not care about the all: rule
|
||||||
# but instead _all depend on modules
|
# but instead _all depend on modules
|
||||||
PHONY += all
|
PHONY += all
|
||||||
|
|
Loading…
Reference in a new issue