From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Tue, 21 Dec 2021 21:05:10 +0000 (+0000)
Subject: meson: make it compatible with AFL and honggfuzz again
X-Git-Tag: v250~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2c3f14fed67e7246adfdeeb5957c0d0497d7dc7;p=thirdparty%2Fsystemd.git

meson: make it compatible with AFL and honggfuzz again

afl-clang and hufzz-clang try to instrument the code and the
underlying compilers don't like it. It should probably be
fixed in both afl and honggfuzz eventually but until then
let's just use "raw" clang to build bpf-skeletons.

It's a follow-up to https://github.com/systemd/systemd/pull/21607
---

diff --git a/meson.build b/meson.build
index 6eae80608ce..c0cbadecb12 100644
--- a/meson.build
+++ b/meson.build
@@ -997,6 +997,9 @@ else
         # Support 'versioned' clang/llvm-strip binaries, as seen on Debian/Ubuntu
         # (like clang-10/llvm-strip-10)
         clang_bin = cc.get_id() == 'clang' ? cc.cmd_array()[0] : 'clang'
+        if clang_bin.contains('afl-clang') or clang_bin.contains('hfuzz-clang')
+                clang_bin = 'clang'
+        endif
         clang = find_program(clang_bin, required : bpf_framework_required)
         if clang.found()
                 llvm_strip_bin = run_command(clang, '--print-prog-name', 'llvm-strip',