From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Sat, 27 Jul 2024 10:53:11 +0000 (+0300)
Subject: Fallback to clang in PATH with meson
X-Git-Tag: REL_18_BETA1~2296
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d8de281b5834c8f5e0be6ae21e884e69dffd4ce;p=thirdparty%2Fpostgresql.git

Fallback to clang in PATH with meson

Some distributions put clang into a different path than the llvm
binary path.

For example, this is the case on NixOS / nixpkgs, which failed to find
clang with meson before this patch.

Author: Wolfgang Walther
Reviewed-by: Nazir Bilal Yavuz, Alvaro Herrera, Peter Eisentraut
Reviewed-by: Tristan Partin
Discussion: https://www.postgresql.org/message-id/ca8f37e1-a2c3-40e2-91f6-59c3d3652ad4@technowledgy.de
Backpatch: 16-, where meson support was added
---

diff --git a/meson.build b/meson.build
index 90e32397750..275c8698f11 100644
--- a/meson.build
+++ b/meson.build
@@ -799,7 +799,10 @@ if add_languages('cpp', required: llvmopt, native: false)
     llvm_binpath = llvm.get_variable(configtool: 'bindir')
 
     ccache = find_program('ccache', native: true, required: false)
-    clang = find_program(llvm_binpath / 'clang', required: true)
+
+    # Some distros put LLVM and clang in different paths, so fallback to
+    # find via PATH, too.
+    clang = find_program(llvm_binpath / 'clang', 'clang', required: true)
   endif
 elif llvmopt.auto()
   message('llvm requires a C++ compiler')