Commit 58156ba4 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: skip 'addtree' and 'flags' magic for external module build 



When building an external module, $(obj) is the absolute path to it.

The header search paths from ccflags-y etc. should not be tweaked.

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

scripts/Makefile.host

+4 −2
Original line number Diff line number Diff line
@@ -67,13 +67,15 @@ _hostc_flags = $(KBUILD_HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ 
_hostcxx_flags = $(KBUILD_HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \

                 $(HOSTCXXFLAGS_$(basetarget).o)



ifeq ($(KBUILD_SRC),)

__hostc_flags	= $(_hostc_flags)

__hostcxx_flags	= $(_hostcxx_flags)

else



ifeq ($(KBUILD_EXTMOD),)

ifneq ($(KBUILD_SRC),)

__hostc_flags	= -I$(obj) $(call flags,_hostc_flags)

__hostcxx_flags	= -I$(obj) $(call flags,_hostcxx_flags)

endif

endif



hostc_flags    = -Wp,-MD,$(depfile) $(__hostc_flags)

hostcxx_flags  = -Wp,-MD,$(depfile) $(__hostcxx_flags)

scripts/Makefile.lib

+6 −5
Original line number Diff line number Diff line
@@ -137,14 +137,14 @@ _c_flags += $(if $(patsubst n%,, \ 
	$(CFLAGS_KCOV))

endif



# If building the kernel in a separate objtree expand all occurrences

# of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').



ifeq ($(KBUILD_SRC),)

__c_flags	= $(_c_flags)

__a_flags	= $(_a_flags)

__cpp_flags     = $(_cpp_flags)

else



# If building the kernel in a separate objtree expand all occurrences

# of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').

ifeq ($(KBUILD_EXTMOD),)

ifneq ($(KBUILD_SRC),)



# -I$(obj) locates generated .h files

# $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files
@@ -155,6 +155,7 @@ __c_flags = $(if $(obj),$(call addtree,-I$(src)) -I$(obj)) \ 
__a_flags	= $(call flags,_a_flags)

__cpp_flags     = $(call flags,_cpp_flags)

endif

endif



c_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \

		 -include $(srctree)/include/linux/compiler_types.h       \

CRA Git | Maintained and supported by SUSTech CRA and CCSE