Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1278598

[tip:perf/core] tools build: Use fixdep with OUTPUT path prefix

Show all headers | View raw

Commit-ID:  5e50426d5d9049dfdb8b2b18e761717e7e80a6ad
Gitweb:     http://git.kernel.org/tip/5e50426d5d9049dfdb8b2b18e761717e7e80a6ad
Author:     Jiri Olsa <jolsa@redhat.com>
AuthorDate: Thu, 26 Nov 2015 19:50:55 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 26 Nov 2015 16:32:24 -0300

tools build: Use fixdep with OUTPUT path prefix

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>
---
 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 a930362..0d5a0e3 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 6254760..be630be 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 CFLAGS= LDFLAGS= fixdep
+	$(Q)$(MAKE) -C $(srctree)/tools/build CFLAGS= LDFLAGS= $(OUTPUT)fixdep
 endif
 
 .PHONY: fixdep
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/3] tools build: Introduce features dump include makefile Jiri Olsa <jolsa@kernel.org> - 2015-11-26 15:00 +0100
  [PATCH 3/3] perf build: Fix traceevent plugins build race Jiri Olsa <jolsa@kernel.org> - 2015-11-26 15:00 +0100
    Re: [PATCH 3/3] perf build: Fix traceevent plugins build race Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-11-26 17:40 +0100
    [tip:perf/core] perf build: Fix traceevent plugins build race tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-11-27 08:50 +0100
  [PATCH 2/3] perf build: Use FEATURE-INCLUDE in bpf subproject Jiri Olsa <jolsa@kernel.org> - 2015-11-26 15:00 +0100
    Re: [PATCH 2/3] perf build: Use FEATURE-INCLUDE in bpf subproject Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-11-26 17:40 +0100
      Re: [PATCH 2/3] perf build: Use FEATURE-INCLUDE in bpf subproject Jiri Olsa <jolsa@redhat.com> - 2015-11-26 19:20 +0100
      Re: [PATCH 2/3] perf build: Use FEATURE-INCLUDE in bpf subproject Jiri Olsa <jolsa@redhat.com> - 2015-11-26 19:20 +0100
        [PATCH] tools build: Use fixdep with OUTPUT path prefix Jiri Olsa <jolsa@redhat.com> - 2015-11-26 20:00 +0100
          Re: [PATCH] tools build: Use fixdep with OUTPUT path prefix Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-11-26 20:40 +0100
          [tip:perf/core] tools build: Use fixdep with OUTPUT path prefix tip-bot for Jiri Olsa <tipbot@zytor.com> - 2015-11-27 08:50 +0100
  Re: [PATCH 1/3] tools build: Introduce features dump include makefile Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-11-26 17:30 +0100

csiph-web