Merge pull request #755 from masuidrive/imprive_build_scripts

Improved build scripts and config files

1 files changed, 6 insertions, 6 deletions

diff --git a/tools/mrbc/mrbc.rake b/tools/mrbc/mrbc.rake
index 74e04bed5..248433cf0 100644
--- a/tools/mrbc/mrbc.rake
+++ b/tools/mrbc/mrbc.rake
@@ -1,12 +1,12 @@
-dir = File.dirname(__FILE__).sub(%r|^\./|, '')
-
 MRuby.each_target do
-  if bins.select { |s| s.to_s == 'mrbc' }
+  dir = File.dirname(__FILE__).relative_path_from(root)
+
+  if bins.find { |s| s.to_s == 'mrbc' }
     exec = exefile("#{build_dir}/bin/mrbc")
-    objs = Dir.glob("#{dir}/*.{c}").map { |f| f.pathmap("#{build_dir}/%X.o") }
+    objs = Dir.glob("#{dir}/*.c").map { |f| objfile(f.pathmap("#{build_dir}/%X")) }
 
-    file exec => objs + ["#{build_dir}/lib/libmruby_core.a"] do |t|
-      link t.name, t.prerequisites
+    file exec => objs + [libfile("#{build_dir}/lib/libmruby_core")] do |t|
+      linker.run t.name, t.prerequisites
     end
   end
 end