From: James Hilliard <james.hilliard1@gmail.com>
Date: Sat, 25 Dec 2021 10:16:57 +0000 (-0700)
Subject: meson: don't try to guess versioned clang/llvm-strip bins for cross compile
X-Git-Tag: v251-rc1~644
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b7b73c7140b3c923064c6bf27a30b0e88a72f7a;p=thirdparty%2Fsystemd.git

meson: don't try to guess versioned clang/llvm-strip bins for cross compile

This should simplify overriding the program locations as the binary
names should now not change if cross compiling.

It's likely any attempts at autodetecting these in cross environments will
be brittle at best so lets just disable it.
---

diff --git a/meson.build b/meson.build
index ef9a0278c97..17b48d2af4f 100644
--- a/meson.build
+++ b/meson.build
@@ -1006,11 +1006,11 @@ 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')
+        if meson.is_cross_build() or 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()
+        if not meson.is_cross_build() and clang.found()
                 llvm_strip_bin = run_command(clang, '--print-prog-name', 'llvm-strip',
                                              check : true).stdout().strip()
         else