okra pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=3908d27b6706bbd682e81b279f63b91d41284b0d

commit 3908d27b6706bbd682e81b279f63b91d41284b0d
Author: Stephen Houston <[email protected]>
Date:   Tue Oct 10 10:05:06 2017 -0500

    Fix meson build when clang headers don't exist.
---
 meson.build         | 3 +++
 src/bin/meson.build | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index dc4350e..f2ef9fd 100644
--- a/meson.build
+++ b/meson.build
@@ -40,6 +40,7 @@ else
 endif
 
 if get_option('libclang') == true and cc.has_header('clang-c/Index.h')
+  has_clang_header = true
   clang = cc.find_library('clang', dirs : ['/usr/local/opt/llvm/lib'])
 
   clang_include_dir_command = 
run_command(find_program('scripts/clang_include_dir.sh'))
@@ -47,6 +48,8 @@ if get_option('libclang') == true and 
cc.has_header('clang-c/Index.h')
 
   config_h.set_quoted('CLANG_INCLUDES', clang_include_dir)
   config_h.set('HAVE_LIBCLANG', '1')
+else
+  has_clang_header = false
 endif
 
 subdir('po')
diff --git a/src/bin/meson.build b/src/bin/meson.build
index b249b28..ee0ad99 100644
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -28,7 +28,7 @@ endforeach
 deps = [elm, edi_lib, intl]
 incls = []
 
-if get_option('libclang') == true
+if get_option('libclang') == true and has_clang_header == true
    deps += [clang]
 
    clang_build_include_dir_command = 
run_command(find_program('../../scripts/clang_build_include_dir.sh'))

-- 


Reply via email to