ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=a7a6b9cb7fa0cd0f880e21c2d2f7853754fff95e
commit a7a6b9cb7fa0cd0f880e21c2d2f7853754fff95e Author: Andy Williams <[email protected]> Date: Mon Oct 23 00:09:14 2017 +0100 meson: remove exposure of lookup paths This was a workaround for OS X which is now catered for in another patch If we need to re-add the option for users this can be reverted --- meson.build | 22 +++++++++------------- meson_options.txt | 2 -- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/meson.build b/meson.build index a40c76b..00e1ff3 100644 --- a/meson.build +++ b/meson.build @@ -40,24 +40,20 @@ else config_h.set_quoted('BEAR_COMMAND', '') endif -opt_clang_header_dir = get_option('libclang-libdir') -opt_clang_link_dir = get_option('libclang-headerdir') +clang_header_dir = '' +clang_link_dir = '' if build_machine.system() == 'darwin' - if opt_clang_header_dir == '' - opt_clang_header_dir = '/usr/local/opt/llvm/include' - endif - if opt_clang_link_dir == '' - opt_clang_link_dir = '/usr/local/opt/llvm/lib' - endif + clang_header_dir = '/usr/local/opt/llvm/include' + clang_link_dir = '/usr/local/opt/llvm/lib' endif if get_option('libclang') == true #check for the header found = false - if opt_clang_header_dir != '' - found = cc.has_header('clang-c/Index.h', args : '-I'+opt_clang_header_dir) + if clang_header_dir != '' + found = cc.has_header('clang-c/Index.h', args : '-I'+clang_header_dir) else found = cc.has_header('clang-c/Index.h') endif @@ -66,11 +62,11 @@ if get_option('libclang') == true error('Clang header not found!') endif - clang_inc = include_directories(opt_clang_header_dir) + clang_inc = include_directories(clang_header_dir) #check for the library to link - if opt_clang_link_dir != '' - clang = cc.find_library('clang', dirs : [opt_clang_link_dir]) + if clang_link_dir != '' + clang = cc.find_library('clang', dirs : [clang_link_dir]) else clang = cc.find_library('clang') endif diff --git a/meson_options.txt b/meson_options.txt index 61f4286..10ae169 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,2 @@ option('libclang', type : 'boolean', value : true, description : 'Weather to have libclang support') option('bear', type : 'boolean', value : true, description : 'Weather to have bear support') -option('libclang-libdir', type : 'string', value : '', description : 'Specify a none default location for your clang installation') -option('libclang-headerdir', type : 'string', value : '', description : 'Specify a none default location for your clang installation') --
