mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: Tie adding C++ support to the llvm Meson option

Browse Source 
In the event the llvm option is defined to be 'auto', it is possible
that the host machine might not have a C++ compiler. If that is the
case, then we shouldn't continue reaching for the llvm dependency.

To make it easier to understand the case where LLVM support is disabled due to
lacking a C++ compiler, add a message noting that fact.

Author: Tristan Partin <tristan@neon.tech>
Reviewed-by: Andres Freund <andres@anarazel.de>
Discussion: https://postgr.es/m/CSPIJVUDZFKX.3KHMOAVGF94RV@c3po
Backpatch: 16-, where meson support was added
This commit is contained in:
Andres Freund 2023-07-12 16:26:02 -07:00
parent 47caa710ce
commit 7a7f13afee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -746,8 +746,8 @@ endif
############################################################### ###############################################################
llvmopt = get_option('llvm') llvmopt = get_option('llvm')
if not llvmopt.disabled() llvm = not_found_dep
add_languages('cpp', required: true, native: false) if add_languages('cpp', required: llvmopt, native: false)
llvm = dependency('llvm', version: '>=3.9', method: 'config-tool', required: llvmopt) llvm = dependency('llvm', version: '>=3.9', method: 'config-tool', required: llvmopt)
if llvm.found() if llvm.found()
@ -761,8 +761,8 @@ if not llvmopt.disabled()
ccache = find_program('ccache', native: true, required: false) ccache = find_program('ccache', native: true, required: false)
clang = find_program(llvm_binpath / 'clang', required: true) clang = find_program(llvm_binpath / 'clang', required: true)
endif endif
else elif llvmopt.auto()
llvm = not_found_dep message('llvm requires a C++ compiler')
endif endif