diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-02-07 07:05:05 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-02-07 07:05:05 +0900 |
| commit | 215906dc83f01864697f16f7401519d15e41ffff (patch) | |
| tree | 21ebae2e20fd3e2e09c4d1bef982098ae2fd4561 | |
| parent | d52f46da4571c7c44954b15f85a00d74ab86f7f3 (diff) | |
| parent | c8628f7ca43d2e660efc3cde3c6a83b5f64438f4 (diff) | |
| download | mruby-215906dc83f01864697f16f7401519d15e41ffff.tar.gz mruby-215906dc83f01864697f16f7401519d15e41ffff.zip | |
Merge pull request #4264 from shuujii/integrate-definition-of-exefile
Integrate definition of `MRuby::Build#exefile`
| -rw-r--r-- | lib/mruby/build.rb | 5 | ||||
| -rw-r--r-- | mrbgems/mruby-bin-mruby-config/mrbgem.rake | 14 |
2 files changed, 4 insertions, 15 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb index 63125d4fa..4f81a970b 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb @@ -270,8 +270,11 @@ EOS def exefile(name) if name.is_a?(Array) name.flatten.map { |n| exefile(n) } - else + elsif File.extname(name).empty? "#{name}#{exts.executable}" + else + # `name` sometimes have (non-standard) extension (e.g. `.bat`). + name end end diff --git a/mrbgems/mruby-bin-mruby-config/mrbgem.rake b/mrbgems/mruby-bin-mruby-config/mrbgem.rake index cca7423ac..b9ba0e42c 100644 --- a/mrbgems/mruby-bin-mruby-config/mrbgem.rake +++ b/mrbgems/mruby-bin-mruby-config/mrbgem.rake @@ -1,17 +1,3 @@ -module MRuby - class Build - def exefile(name) - if name.is_a?(Array) - name.flatten.map { |n| exefile(n) } - elsif name !~ /\./ - "#{name}#{exts.executable}" - else - name - end - end - end -end - MRuby.each_target do next if kind_of? MRuby::CrossBuild |