scripts/pahole-flags.sh: Use pahole-version.sh
authorNathan Chancellor <nathan@kernel.org>
Tue, 1 Feb 2022 20:56:22 +0000 (13:56 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 2 Feb 2022 10:19:33 +0000 (11:19 +0100)
Use pahole-version.sh to get pahole's version code to reduce the amount
of duplication across the tree.

Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220201205624.652313-4-nathan@kernel.org
scripts/pahole-flags.sh

index e6093ad..c293941 100755 (executable)
@@ -7,7 +7,7 @@ if ! [ -x "$(command -v ${PAHOLE})" ]; then
        exit 0
 fi
 
-pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/')
+pahole_ver=$($(dirname $0)/pahole-version.sh ${PAHOLE})
 
 if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then
        # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars