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

Groups > linux.kernel > #1495276

[tip:perf/urgent] tools build: Make fixdep a hostprog

Show all headers | View raw

Commit-ID:  6b3db6f9b970001b751a6cd001bc2ab581ce0fb3
Gitweb:     http://git.kernel.org/tip/6b3db6f9b970001b751a6cd001bc2ab581ce0fb3
Author:     Jiri Olsa <jolsa@redhat.com>
AuthorDate: Tue, 27 Sep 2016 16:18:46 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 3 Oct 2016 11:40:35 -0300

tools build: Make fixdep a hostprog

It is used in the build process, so stop suppressing its build in tools
cross builds.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: linuxppc-dev@lists.ozlabs.org
Link: http://lkml.kernel.org/r/20160927141846.GA6589@krava
[ Use HOSTCC on the $(OUTPUT)fixdep target, it was using the x-compiler
  to link fixdep-in.o, that was correctly built with HOSTCC and thus failing ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/build/Build            | 2 ++
 tools/build/Makefile         | 2 +-
 tools/build/Makefile.include | 4 ----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/build/Build b/tools/build/Build
index 63a6c34..76d1a49 100644
--- a/tools/build/Build
+++ b/tools/build/Build
@@ -1 +1,3 @@
+hostprogs := fixdep
+
 fixdep-y := fixdep.o
diff --git a/tools/build/Makefile b/tools/build/Makefile
index 653faee..8332959 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -42,7 +42,7 @@ $(OUTPUT)fixdep-in.o: FORCE
 	$(Q)$(MAKE) $(build)=fixdep
 
 $(OUTPUT)fixdep: $(OUTPUT)fixdep-in.o
-	$(QUIET_LINK)$(CC) $(LDFLAGS) -o $@ $<
+	$(QUIET_LINK)$(HOSTCC) $(LDFLAGS) -o $@ $<
 
 FORCE:
 
diff --git a/tools/build/Makefile.include b/tools/build/Makefile.include
index be630be..ad22e4e 100644
--- a/tools/build/Makefile.include
+++ b/tools/build/Makefile.include
@@ -1,10 +1,6 @@
 build := -f $(srctree)/tools/build/Makefile.build dir=. obj
 
-ifdef CROSS_COMPILE
-fixdep:
-else
 fixdep:
 	$(Q)$(MAKE) -C $(srctree)/tools/build CFLAGS= LDFLAGS= $(OUTPUT)fixdep
-endif
 
 .PHONY: fixdep

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

Thread

Re: [PATCH v21 00/20] perf, tools: Add support for PMU events in  JSON format Jiri Olsa <jolsa@redhat.com> - 2016-09-26 10:40 +0200
  Re: [PATCH v21 00/20] perf, tools: Add support for PMU events in  JSON format Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-09-26 17:10 +0200
    Re: [PATCH v21 00/20] perf, tools: Add support for PMU events in  JSON format Andi Kleen <andi@firstfloor.org> - 2016-09-26 19:10 +0200
      Re: [PATCH v21 00/20] perf, tools: Add support for PMU events in  JSON format Jiri Olsa <jolsa@redhat.com> - 2016-09-27 16:20 +0200
        Re: [PATCH v21 00/20] perf, tools: Add support for PMU events in  JSON format Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-09-30 00:30 +0200
          Re: [PATCH v21 00/20] perf, tools: Add support for PMU events in  JSON format Jiri Olsa <jolsa@redhat.com> - 2016-09-30 11:20 +0200
        [tip:perf/urgent] tools build: Add support for host programs format tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-10-04 10:20 +0200
        [tip:perf/urgent] perf jevents: Program to convert JSON file tip-bot for Andi Kleen <tipbot@zytor.com> - 2016-10-04 10:20 +0200
        [tip:perf/urgent] tools build: Make fixdep a hostprog tip-bot for Jiri Olsa <tipbot@zytor.com> - 2016-10-04 10:20 +0200

csiph-web