vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build on OSX with clang but no bear

This commit is contained in:
Andy Williams 2017-10-04 23:06:27 +01:00
parent 251ea96020
commit 2e69a791b7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -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()) 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', required : false)
bear = find_program('bear') if get_option('bear') == true and bear.found()
config_h.set_quoted('BEAR_COMMAND', 'bear') config_h.set_quoted('BEAR_COMMAND', 'bear')
else else
config_h.set_quoted('BEAR_COMMAND', '') config_h.set_quoted('BEAR_COMMAND', '')
endif endif
if get_option('libclang') == true 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_command = run_command(find_program('scripts/clang_include_dir.sh'))
clang_include_dir = clang_include_dir_command.stdout().strip() clang_include_dir = clang_include_dir_command.stdout().strip()

2
scripts/clang_include_dir.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
clang -E - -v < /dev/null 2>&1 | grep "^ /usr" | grep clang clang -E - -v < /dev/null 2>&1 | grep "^ /" | grep clang