Integrate definition of `MRuby::Build#exefile`

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