diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-02-21 22:40:17 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-02-21 22:40:17 +0900 |
| commit | 5cc277340f3107efb206fed3a3e72eebbf286a6b (patch) | |
| tree | 4d6b7083de00a4f5d2d9ac148d150df6e197aac4 /lib | |
| parent | 769b56c3aeeb6601e844817c04a72cace3000fe9 (diff) | |
| parent | 37fb5f929ff5669af14b7753ce7c515f0839066d (diff) | |
| download | mruby-5cc277340f3107efb206fed3a3e72eebbf286a6b.tar.gz mruby-5cc277340f3107efb206fed3a3e72eebbf286a6b.zip | |
Merge pull request #4291 from shuujii/fix-typo-in-lib-mruby-build-command.rb
Fix typo in `lib/mruby/build/command.rb`
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mruby/build/command.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/mruby/build/command.rb b/lib/mruby/build/command.rb index 694b4a24c..0f18e0e62 100644 --- a/lib/mruby/build/command.rb +++ b/lib/mruby/build/command.rb @@ -67,8 +67,8 @@ module MRuby path && build.filename("#{path}/#{name}").sub(/^"(.*)"$/, '\1') end - def all_flags(_defineds=[], _include_paths=[], _flags=[]) - define_flags = [defines, _defineds].flatten.map{ |d| option_define % d } + def all_flags(_defines=[], _include_paths=[], _flags=[]) + define_flags = [defines, _defines].flatten.map{ |d| option_define % d } include_path_flags = [include_paths, _include_paths].flatten.map do |f| if MRUBY_BUILD_HOST_IS_CYGWIN option_include_path % cygwin_filename(f) @@ -79,14 +79,14 @@ module MRuby [flags, define_flags, include_path_flags, _flags].flatten.join(' ') end - def run(outfile, infile, _defineds=[], _include_paths=[], _flags=[]) + def run(outfile, infile, _defines=[], _include_paths=[], _flags=[]) FileUtils.mkdir_p File.dirname(outfile) _pp "CC", infile.relative_path, outfile.relative_path if MRUBY_BUILD_HOST_IS_CYGWIN - _run compile_options, { :flags => all_flags(_defineds, _include_paths, _flags), + _run compile_options, { :flags => all_flags(_defines, _include_paths, _flags), :infile => cygwin_filename(infile), :outfile => cygwin_filename(outfile) } else - _run compile_options, { :flags => all_flags(_defineds, _include_paths, _flags), + _run compile_options, { :flags => all_flags(_defines, _include_paths, _flags), :infile => filename(infile), :outfile => filename(outfile) } end end |
