resolve conflict

1 files changed, 12 insertions, 3 deletions

diff --git a/Rakefile b/Rakefile
index 6a04ef87c..ac2d43ae5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,8 +8,17 @@ load 'tasks/mrbgem_spec.rake'
 
 ##############################
 # compile flags
-MRUBY_CONFIG = File.expand_path(ENV['MRUBY_CONFIG'] || './build_config.rb')
-load MRUBY_CONFIG
+load 'build_config.rb'
+
+MRUBY_CONFIGS = ['build_config.rb']
+if ENV['MRUBY_CONFIG']
+  MRUBY_CONFIGS << ENV['MRUBY_CONFIG']
+  load ENV['MRUBY_CONFIG']
+end
+
+MRuby.each_target do |build|
+  build.define_rules
+end
 
 load 'src/mruby_core.rake'
 load 'mrblib/mrblib.rake'
@@ -34,7 +43,7 @@ depfiles = MRuby.targets['host'].bins.map do |bin|
     FileUtils.rm t.name, :force => true
     FileUtils.cp t.prerequisites.first, t.name
   end
-   
+  
   install_path
 end