diff mbox series

[J,UNSTABLE,4/7] scripts/pahole-flags.sh: Use pahole-version.sh

Message ID 20220207151516.211675-5-dimitri.ledkov@canonical.com
State New
Headers show
Series Upgrade from DWARF4 to DWARF5 | expand

Commit Message

Dimitri John Ledkov Feb. 7, 2022, 3:15 p.m. UTC 
From: Nathan Chancellor <nathan@kernel.org>

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
(cherry picked from bpf-next commit 2d6c9810eb8915c4ddede707b8e167a1d919e1ca)
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
---
 scripts/pahole-flags.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
index 2b99fc7701..ac8b237874 100755
--- a/scripts/pahole-flags.sh
+++ b/scripts/pahole-flags.sh
@@ -7,7 +7,7 @@  if ! [ -x "$(command -v ${PAHOLE})" ]; then
 	return
 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