diff options
author | Namhyung Kim <namhyung@kernel.org> | 2024-02-12 23:19:21 +0300 |
---|---|---|
committer | Namhyung Kim <namhyung@kernel.org> | 2024-02-12 23:19:21 +0300 |
commit | 39d14c0dd650f3de62242c2f92fb4d7a0ec3386a (patch) | |
tree | 4c600896eea221affb50aa2ff34a214868c38d7f /tools/perf/Makefile.perf | |
parent | c7ba9d18ae47924a6ea6a47ca139779f58eb83c0 (diff) | |
parent | fdd0ae72b34e56eb5e896d067c49a78ecb451032 (diff) | |
download | linux-39d14c0dd650f3de62242c2f92fb4d7a0ec3386a.tar.xz |
Merge branch 'perf-tools' into perf-tools-next
To get some fixes in the perf test and JSON metrics into the development
branch.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Diffstat (limited to 'tools/perf/Makefile.perf')
-rw-r--r-- | tools/perf/Makefile.perf | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index f86871564954..4aa4c39d414c 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -236,6 +236,16 @@ else SHELLCHECK := $(shell which shellcheck 2> /dev/null) endif +# shellcheck is using in tools/perf/tests/Build with option -a/--check-sourced ( +# introduced in v0.4.7) and -S/--severity (introduced in v0.6.0). So make the +# minimal shellcheck version as v0.6.0. +ifneq ($(SHELLCHECK),) + ifeq ($(shell expr $(shell $(SHELLCHECK) --version | grep version: | \ + sed -e 's/.\+ \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1\2\3/g') \< 060), 1) + SHELLCHECK := + endif +endif + export srctree OUTPUT RM CC CXX LD AR CFLAGS CXXFLAGS V BISON FLEX AWK export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK |