diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-05 07:37:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-06-05 07:37:37 +0200 |
| commit | 16b58423b4c33dfd9622dcfc93bc5ce35c17ce72 (patch) | |
| tree | eb841aa73d3097d439da9f1cc1cdb36726342d36 /tools/perf/util/Build | |
| parent | base/node: Use 'property' to identify an access parameter (diff) | |
| parent | Linux 6.4-rc5 (diff) | |
| download | linux-16b58423b4c33dfd9622dcfc93bc5ce35c17ce72.tar.xz linux-16b58423b4c33dfd9622dcfc93bc5ce35c17ce72.zip | |
Merge 6.4-rc5 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/util/Build')
| -rw-r--r-- | tools/perf/util/Build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/Build b/tools/perf/util/Build index bd18fe5f2719..f9df1df1eec0 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -214,7 +214,7 @@ perf-$(CONFIG_ZSTD) += zstd.o perf-$(CONFIG_LIBCAP) += cap.o -perf-y += demangle-cxx.o +perf-$(CONFIG_CXX_DEMANGLE) += demangle-cxx.o perf-y += demangle-ocaml.o perf-y += demangle-java.o perf-y += demangle-rust.o |