From: Dominique Martinet <asmadeus@codewreck.org>
Date: Sat, 20 Jul 2024 11:38:37 +0000 (+0900)
Subject: meson: fix missing failure if bpf-framework was enabled
X-Git-Tag: v257-rc1~867
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8da20e3fe2a544979922cea457de3031aa74d64c;p=thirdparty%2Fsystemd.git

meson: fix missing failure if bpf-framework was enabled

If building with clang and clang does not support bpf, then enabling
-Dbpf-framework=enabled would silently drop the feature (even printing
bpf-framework: enabled in the meson build recap, and no message anywhere
that'd hint at the failure!)

This is unexpected, so add check to fail hard in this case.

All other code paths (gcc, missing bpftool) properly check for the
option, but it is not as easy for a custom command so check explicitly
---

diff --git a/meson.build b/meson.build
index 3893a9fabef..e0bbb6a9086 100644
--- a/meson.build
+++ b/meson.build
@@ -1102,6 +1102,9 @@ else
                         # Check if 'clang -target bpf' is supported.
                         clang_supports_bpf = run_command(clang, '-target', 'bpf', '--print-supported-cpus', check : false).returncode() == 0
                 endif
+                if bpf_framework.enabled() and not clang_supports_bpf
+                        error('bpf-framework was enabled but clang does not support bpf')
+                endif
         elif bpf_compiler == 'gcc'
                 bpf_gcc = find_program('bpf-gcc',
                                        'bpf-none-gcc',