1 files changed, 4 insertions, 16 deletions
diff --git a/tasks/bin.rake b/tasks/bin.rake
index afef065a1..bc8820b66 100644
--- a/tasks/bin.rake
+++ b/tasks/bin.rake
@@ -1,35 +1,23 @@
-install_task = ->(src) do
-  dst = "#{MRuby::Build.install_dir}/#{File.basename(src)}"
-  file dst => src do
-    install_D src, dst
-  end
-  dst
-end
-
 MRuby.each_target do |build|
   if build.host? && build.mrbc_build && !build.gems["mruby-bin-mrbc"]
     exe = build.exefile("#{build.mrbc_build.build_dir}/bin/mrbc")
-    build.products << install_task.(exe)
+    build.products << build.define_installer(exe)
   end
 
-  build.bins.each do |bin|
-    exe = build.exefile("#{build.build_dir}/bin/#{bin}")
-    build.products << (build.host? ? install_task.(exe) : exe)
-  end
+  build.bins.each{|bin| build.products << define_installer_if_needed(bin)}
 
-  linker_attrs = build.gems.map{|gem| gem.linker.run_attrs}.transpose
+  linker_attrs = build.gems.linker_attrs
   build.gems.each do |gem|
     gem.bins.each do |bin|
       exe = build.exefile("#{build.build_dir}/bin/#{bin}")
       objs = Dir["#{gem.dir}/tools/#{bin}/*.{c,cpp,cxx,cc}"].map do |f|
         build.objfile(f.pathmap("#{gem.build_dir}/tools/#{bin}/%n"))
       end
-
       file exe => objs.concat(build.libraries) do |t|
         build.linker.run t.name, t.prerequisites, *linker_attrs
       end
 
-      build.products << (build.host? ? install_task.(exe) : exe)
+      build.products << define_installer_if_needed(bin)
     end
   end
 end