ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=dda9a59fc4e1bd24811f413cfa025f6eb6f957ce
commit dda9a59fc4e1bd24811f413cfa025f6eb6f957ce Author: Andy Williams <[email protected]> Date: Wed Oct 4 23:52:29 2017 +0100 Fix clang lookup dirs on osx --- meson.build | 2 +- scripts/clang_include_dir.sh | 7 ++++++- src/bin/meson.build | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 69ce5ba..d66e3ea 100644 --- a/meson.build +++ b/meson.build @@ -38,7 +38,7 @@ else endif if get_option('libclang') == true - clang = cc.find_library('clang', dirs : ['/Library/Developer/CommandLineTools/usr/lib/']) + clang = cc.find_library('clang', dirs : ['/usr/local/opt/llvm/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 f70a780..f3447ea 100755 --- a/scripts/clang_include_dir.sh +++ b/scripts/clang_include_dir.sh @@ -1,3 +1,8 @@ #!/bin/sh -clang -E - -v < /dev/null 2>&1 | grep "^ /" | grep clang +BINDIR= +if [[ -d /usr/local/opt/llvm ]]; then + BINDIR="/usr/local/opt/llvm/bin/" +fi + +${BINDIR}clang -E - -v < /dev/null 2>&1 | grep "^ /" | grep clang diff --git a/src/bin/meson.build b/src/bin/meson.build index 3b1ef6c..adfa5d8 100644 --- a/src/bin/meson.build +++ b/src/bin/meson.build @@ -26,13 +26,16 @@ foreach package : packages endforeach deps = [elm, edi_lib] +libs = [] if get_option('libclang') == true deps += [clang] + libs += include_directories('/usr/local/opt/llvm/include') endif executable('edi', src, dependencies : deps, + include_directories : libs, install : true ) --
