60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
From: Jiri Olsa <jolsa@redhat.com>
|
|
Date: Thu, 26 Nov 2015 19:50:55 +0100
|
|
Subject: tools build: Use fixdep with OUTPUT path prefix
|
|
Origin: https://git.kernel.org/linus/5e50426d5d9049dfdb8b2b18e761717e7e80a6ad
|
|
|
|
Adding OUTPUT path prefix for fixdep target so we use it properly in out
|
|
of tree builds.
|
|
|
|
If the fixdep already existed in the tree, the out of tree build would
|
|
see it already exist and did not build the out of tree version, as
|
|
reported by Arnaldo:
|
|
|
|
[acme@zoo linux]$ make O=/tmp/build/perf -C tools/perf
|
|
make: Entering directory '/home/git/linux/tools/perf'
|
|
BUILD: Doing 'make -j4' parallel build
|
|
make[2]: Nothing to be done for 'fixdep'.
|
|
make: Leaving directory '/home/git/linux/tools/perf'
|
|
|
|
Reported-and-Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
|
|
Cc: David Ahern <dsahern@gmail.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
|
|
Cc: Wang Nan <wangnan0@huawei.com>
|
|
Link: http://lkml.kernel.org/r/20151126185055.GC19410@krava.brq.redhat.com
|
|
[ Fixed conflict with 5725dd8fa888 ("tools build: Clean CFLAGS and LDFLAGS for fixdep") ]
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
[bwh: Backported to 4.4: adjust context]
|
|
---
|
|
tools/build/Makefile | 2 +-
|
|
tools/build/Makefile.include | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tools/build/Makefile b/tools/build/Makefile
|
|
index a93036272d43..0d5a0e3a8fa9 100644
|
|
--- a/tools/build/Makefile
|
|
+++ b/tools/build/Makefile
|
|
@@ -25,7 +25,7 @@ export Q srctree CC LD
|
|
MAKEFLAGS := --no-print-directory
|
|
build := -f $(srctree)/tools/build/Makefile.build dir=. obj
|
|
|
|
-all: fixdep
|
|
+all: $(OUTPUT)fixdep
|
|
|
|
clean:
|
|
$(call QUIET_CLEAN, fixdep)
|
|
diff --git a/tools/build/Makefile.include b/tools/build/Makefile.include
|
|
index 6254760290c9..be630bed66d2 100644
|
|
--- a/tools/build/Makefile.include
|
|
+++ b/tools/build/Makefile.include
|
|
@@ -4,7 +4,7 @@ ifdef CROSS_COMPILE
|
|
fixdep:
|
|
else
|
|
fixdep:
|
|
- $(Q)$(MAKE) -C $(srctree)/tools/build fixdep
|
|
+ $(Q)$(MAKE) -C $(srctree)/tools/build $(OUTPUT)fixdep
|
|
endif
|
|
|
|
.PHONY: fixdep
|