Skip to content

L
linux
Commit b8cbfa69 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

parents 78b9c0f9 e623a3b8
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Makefile
View file @ b8cbfa69
...@@ -347,7 +347,7 @@ AFLAGS_KERNEL = ...@@ -347,7 +347,7 @@ AFLAGS_KERNEL =
# Needed to be compatible with the O= option # Needed to be compatible with the O= option
LINUXINCLUDE := -Iinclude \ LINUXINCLUDE := -Iinclude \
$(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \ $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
-imacros include/linux/autoconf.h -include include/linux/autoconf.h
CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE) CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE)
...@@ -407,7 +407,7 @@ outputmakefile: ...@@ -407,7 +407,7 @@ outputmakefile:
# of make so .config is not included in this case either (for *config). # of make so .config is not included in this case either (for *config).
no-dot-config-targets := clean mrproper distclean \ no-dot-config-targets := clean mrproper distclean \
cscope TAGS tags help %docs check% cscope TAGS tags help %docs check% kernelrelease
config-targets := 0 config-targets := 0
mixed-targets := 0 mixed-targets := 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7