postgres.git / summary / log / commit / refs

commit    a32ffeebfa63dd3e6ee8f9498a7e59ebd8abba8d
Author:   Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date:     Sat Jul 27 10:53:11 2024 +0000
First released in: 18.0, 16.4, 17.0

    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


 meson.build | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 7a89e4cedc8..387b043ebf4 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')


[parent: 469b97c52413]