summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlan Maguire <alan.maguire@oracle.com>2024-05-14 17:27:16 +0100
committerAlexei Starovoitov <ast@kernel.org>2024-05-18 10:46:16 -0700
commit34021caef79f76e70ac31247d321ecd0683c4939 (patch)
treeb0fa2ab7294afb00d3ed9d81c4442cbd8767c372 /scripts
parente7b64f9d3f5b10186038201e0b91f734cbd7fc3d (diff)
downloadlwn-34021caef79f76e70ac31247d321ecd0683c4939.tar.gz
lwn-34021caef79f76e70ac31247d321ecd0683c4939.zip
kbuild, bpf: Use test-ge check for v1.25-only pahole
There is no need to set the pahole v1.25-only flags in an "ifeq" version clause; we are already in a <= v1.25 branch of "ifeq", so that combined with a "test-ge" v1.25 ensures the flags will be applied for v1.25 only. Suggested-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Alan Maguire <alan.maguire@oracle.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20240514162716.2448265-1-alan.maguire@oracle.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.btf4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/Makefile.btf b/scripts/Makefile.btf
index 2d6e5ed9081e..bca8a8f26ea4 100644
--- a/scripts/Makefile.btf
+++ b/scripts/Makefile.btf
@@ -14,9 +14,7 @@ pahole-flags-$(call test-ge, $(pahole-ver), 121) += --btf_gen_floats
pahole-flags-$(call test-ge, $(pahole-ver), 122) += -j
-ifeq ($(pahole-ver), 125)
-pahole-flags-y += --skip_encoding_btf_inconsistent_proto --btf_gen_optimized
-endif
+pahole-flags-$(call test-ge, $(pahole-ver), 125) += --skip_encoding_btf_inconsistent_proto --btf_gen_optimized
else