summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-03 18:34:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-03 18:34:00 -0700
commitaf6f157a4b4f511d06d564086cb3516bb164b7c6 (patch)
tree528d401c000d4da2711ad46a8be60eb0c5833a80
parent0fba687f9b7ebf5fb028fb8b0a4733b891986bd3 (diff)
parentc2e28dc975ea87feed84415006ae143424912ac7 (diff)
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild fix from Michal Marek: "There is one more fix for the relative paths series from -rc1: Print the path to the build directory at the start of the build, so that editors and IDEs can match the relative paths to source files" * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild: Print the name of the build directory
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 13175632137f..b0ee945885aa 100644
--- a/Makefile
+++ b/Makefile
@@ -126,7 +126,10 @@ PHONY += $(MAKECMDGOALS) sub-make
$(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make
@:
+# Fake the "Entering directory" message once, so that IDEs/editors are
+# able to understand relative filenames.
sub-make: FORCE
+ @echo "make[1]: Entering directory \`$(KBUILD_OUTPUT)'"
$(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \
KBUILD_SRC=$(CURDIR) \
KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile \