ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=2e69a791b7734ae112f745cbfc6b3673ddfd7136
commit 2e69a791b7734ae112f745cbfc6b3673ddfd7136
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Oct 4 23:06:27 2017 +0100
Fix build on OSX with clang but no bear
---
meson.build | 6 +++---
scripts/clang_include_dir.sh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index 2cf1083..69ce5ba 100644
--- a/meson.build
+++ b/meson.build
@@ -30,15 +30,15 @@ cc = meson.get_compiler('c')
config_h.set_quoted('EFL_CFLAGS', run_command(find_program('pkg-config'),
'--libs', '--cflags', 'elementary').stdout().strip())
-if get_option('bear') == true
- bear = find_program('bear')
+bear = find_program('bear', required : false)
+if get_option('bear') == true and bear.found()
config_h.set_quoted('BEAR_COMMAND', 'bear')
else
config_h.set_quoted('BEAR_COMMAND', '')
endif
if get_option('libclang') == true
- clang = cc.find_library('clang')
+ clang = cc.find_library('clang', dirs :
['/Library/Developer/CommandLineTools/usr/lib/'])
clang_include_dir_command =
run_command(find_program('scripts/clang_include_dir.sh'))
clang_include_dir = clang_include_dir_command.stdout().strip()
diff --git a/scripts/clang_include_dir.sh b/scripts/clang_include_dir.sh
index a5b4ce5..f70a780 100755
--- a/scripts/clang_include_dir.sh
+++ b/scripts/clang_include_dir.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-clang -E - -v < /dev/null 2>&1 | grep "^ /usr" | grep clang
+clang -E - -v < /dev/null 2>&1 | grep "^ /" | grep clang
--
