diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-12-17 14:37:24 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2020-12-17 14:37:24 -0300 |
| commit | 281a94b0f2f0775a2b7825c18bccf7e4c922b7b3 (patch) | |
| tree | 9c6b8a2d392a1640d84989de25e079f3758c4f1a /tools/perf | |
| parent | feca8a8342d3f53e394c9fc7d985b98ec0250ce1 (diff) | |
| parent | accefff5b547a9a1d959c7e76ad539bf2480e78b (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and check what UAPI headers need to be synched.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/Makefile.perf | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 7ce3f2e8b9c7..62f3deb1d3a8 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -175,10 +175,6 @@ endef LD += $(EXTRA_LDFLAGS) -HOSTCC ?= gcc -HOSTLD ?= ld -HOSTAR ?= ar - PKG_CONFIG = $(CROSS_COMPILE)pkg-config LLVM_CONFIG ?= llvm-config |