summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2014-06-05 17:44:44 +0200
committerMichal Marek <mmarek@suse.cz>2014-06-05 17:55:48 +0200
commitd4bc590f8716f7dde6b7bca319097ac30a8cb0b4 (patch)
treec3b371f14281e386cc6ca44d63bf8cbb64d3554a /arch
parent9da0763bdd82572be243fcf5161734f11568960f (diff)
downloadlinux-stable-d4bc590f8716f7dde6b7bca319097ac30a8cb0b4.tar.gz
linux-stable-d4bc590f8716f7dde6b7bca319097ac30a8cb0b4.tar.bz2
linux-stable-d4bc590f8716f7dde6b7bca319097ac30a8cb0b4.zip
um: Fix for relative objtree when generating x86 headers
In an O= build, rely on the generated Makefile to call the main Makefile properly. When building in the source tree, we do not need to specify the -C and O= either. This fixes the problem when $(objtree) is a relative path and the -C changes the directory. Reported-by: Richard Weinberger <richard.weinberger@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 36e658a4291c..e4b1a9639c4d 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -111,8 +111,7 @@ endef
KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig
archheaders:
- $(Q)$(MAKE) -C '$(srctree)' KBUILD_SRC= \
- ARCH=$(HEADER_ARCH) O='$(objtree)' archheaders
+ $(Q)$(MAKE) KBUILD_SRC= ARCH=$(HEADER_ARCH) archheaders
archprepare: include/generated/user_constants.h