diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-01-15 21:56:40 -0500 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-01-27 19:11:17 -0500 |
| commit | 58156ba4468f1d0de166a4330374bc9df9b74efc (patch) | |
| tree | b5e8269f2248f1ce8802d3c264aedee534bd9fd7 /scripts/Makefile.lib | |
| parent | f17b5f06cb92ef2250513a1e154c47b78df07d40 (diff) | |
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: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/Makefile.lib')
| -rw-r--r-- | scripts/Makefile.lib | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 12b88d09c3a4..ecad15b4cda3 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib | |||
| @@ -137,14 +137,14 @@ _c_flags += $(if $(patsubst n%,, \ | |||
| 137 | $(CFLAGS_KCOV)) | 137 | $(CFLAGS_KCOV)) |
| 138 | endif | 138 | endif |
| 139 | 139 | ||
| 140 | # If building the kernel in a separate objtree expand all occurrences | ||
| 141 | # of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/'). | ||
| 142 | |||
| 143 | ifeq ($(KBUILD_SRC),) | ||
| 144 | __c_flags = $(_c_flags) | 140 | __c_flags = $(_c_flags) |
| 145 | __a_flags = $(_a_flags) | 141 | __a_flags = $(_a_flags) |
| 146 | __cpp_flags = $(_cpp_flags) | 142 | __cpp_flags = $(_cpp_flags) |
| 147 | else | 143 | |
| 144 | # If building the kernel in a separate objtree expand all occurrences | ||
| 145 | # of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/'). | ||
| 146 | ifeq ($(KBUILD_EXTMOD),) | ||
| 147 | ifneq ($(KBUILD_SRC),) | ||
| 148 | 148 | ||
| 149 | # -I$(obj) locates generated .h files | 149 | # -I$(obj) locates generated .h files |
| 150 | # $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files | 150 | # $(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)) \ | |||
| 155 | __a_flags = $(call flags,_a_flags) | 155 | __a_flags = $(call flags,_a_flags) |
| 156 | __cpp_flags = $(call flags,_cpp_flags) | 156 | __cpp_flags = $(call flags,_cpp_flags) |
| 157 | endif | 157 | endif |
| 158 | endif | ||
| 158 | 159 | ||
| 159 | c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ | 160 | c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ |
| 160 | -include $(srctree)/include/linux/compiler_types.h \ | 161 | -include $(srctree)/include/linux/compiler_types.h \ |
