summaryrefslogtreecommitdiffstats
path: root/0001-tools-build-Fixup-host-c-flags.patch
diff options
context:
space:
mode:
Diffstat (limited to '0001-tools-build-Fixup-host-c-flags.patch')
-rw-r--r--0001-tools-build-Fixup-host-c-flags.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/0001-tools-build-Fixup-host-c-flags.patch b/0001-tools-build-Fixup-host-c-flags.patch
new file mode 100644
index 000000000..2a99f1079
--- /dev/null
+++ b/0001-tools-build-Fixup-host-c-flags.patch
@@ -0,0 +1,50 @@
+From b8c8dc142ff2f7f46060ed77b2de05c813233029 Mon Sep 17 00:00:00 2001
+From: Laura Abbott <labbott@redhat.com>
+Date: Fri, 6 Jul 2018 17:11:31 -0700
+Subject: [PATCHv2 1/7] tools: build: Fixup host c flags
+To: Masahiro Yamada <yamada.masahiro@socionext.com>
+To: Josh Poimboeuf <jpoimboe@redhat.com>
+To: Jiri Olsa <jolsa@kernel.org>
+Cc: linux-kbuild@vger.kernel.org
+Cc: linux-kernel@vger.kernel.org
+Cc: Robin Jarry <robin.jarry@6wind.com>
+
+Commit 0c3b7e42616f ("tools build: Add support for host programs format")
+introduced host_c_flags which referenced CHOSTFLAGS. The actual name of the
+variable is HOSTCFLAGS. Fix this up.
+
+Fixes: 0c3b7e42616f ("tools build: Add support for host programs format")
+Signed-off-by: Laura Abbott <labbott@redhat.com>
+---
+v2: Also fixed another instance in perf pmu-events.
+---
+ tools/build/Build.include | 2 +-
+ tools/perf/pmu-events/Build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/build/Build.include b/tools/build/Build.include
+index a4bbb984941d..b5c679cd441c 100644
+--- a/tools/build/Build.include
++++ b/tools/build/Build.include
+@@ -98,4 +98,4 @@ cxx_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(CXXFLAGS) -D"BUILD_STR(s)=\#s" $(CXX
+ ###
+ ## HOSTCC C flags
+
+-host_c_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj))
++host_c_flags = -Wp,-MD,$(depfile) -Wp,-MT,$@ $(HOSTCFLAGS) -D"BUILD_STR(s)=\#s" $(HOSTCFLAGS_$(basetarget).o) $(HOSTCFLAGS_$(obj))
+diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build
+index 17783913d330..215ba30b8534 100644
+--- a/tools/perf/pmu-events/Build
++++ b/tools/perf/pmu-events/Build
+@@ -1,7 +1,7 @@
+ hostprogs := jevents
+
+ jevents-y += json.o jsmn.o jevents.o
+-CHOSTFLAGS_jevents.o = -I$(srctree)/tools/include
++HOSTCFLAGS_jevents.o = -I$(srctree)/tools/include
+ pmu-events-y += pmu-events.o
+ JDIR = pmu-events/arch/$(SRCARCH)
+ JSON = $(shell [ -d $(JDIR) ] && \
+--
+2.17.1
+