diff options
| -rw-r--r-- | lib/mruby/build/command.rb | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-bin-mirb/mrbgem.rake | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/mruby/build/command.rb b/lib/mruby/build/command.rb index f8dddd5b1..854346a7e 100644 --- a/lib/mruby/build/command.rb +++ b/lib/mruby/build/command.rb @@ -32,8 +32,6 @@ module MRuby end end - NotFoundCommands = {} - private def _run(options, params={}) sh "#{build.filename(command)} #{options % params}" diff --git a/mrbgems/mruby-bin-mirb/mrbgem.rake b/mrbgems/mruby-bin-mirb/mrbgem.rake index a74871d81..a4ae6840a 100644 --- a/mrbgems/mruby-bin-mirb/mrbgem.rake +++ b/mrbgems/mruby-bin-mirb/mrbgem.rake @@ -20,6 +20,15 @@ MRuby::Gem::Specification.new('mruby-bin-mirb') do |spec| spec.linker.libraries << 'edit' else spec.linker.libraries << 'readline' + if RUBY_PLATFORM.include?('darwin') + # Workaround to build with Homebrew's readline on Mac (#4537) + lib_path = spec.build.cc.header_search_paths.find do |include_path| + lib_path = File.expand_path("#{include_path}/../lib") + break lib_path if File.exist?("#{lib_path}/libreadline.dylib") || + File.exist?("#{lib_path}/libreadline.a") + end + spec.linker.library_paths << lib_path if lib_path + end if spec.build.cc.search_header_path 'curses.h' spec.linker.libraries << 'ncurses' end |