resolve conflict

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
 

build_config.rb

@@ -74,5 +74,5 @@ end
 #   conf.cc.flags << "-m32"
 #   conf.linker.flags << "-m32"
 #   
-#   conf.gem 'examples/mrbgems/c_and_ruby_extension_example'
+#   conf.gem 'doc/mrbgems/c_and_ruby_extension_example'
 # end

tasks/mrbgem_spec.rake

@@ -35,7 +35,6 @@ module MRuby
 
       def setup
         MRuby::Gem.current = self
-
         @build.compilers.each do |compiler|
           compiler.include_paths << "#{dir}/include"
         end

tasks/mrbgems.rake

@@ -8,7 +8,7 @@ MRuby.each_target do
     # loader all gems
     self.libmruby << objfile("#{build_dir}/mrbgems/gem_init")
     file objfile("#{build_dir}/mrbgems/gem_init") => "#{build_dir}/mrbgems/gem_init.c"
-    file "#{build_dir}/mrbgems/gem_init.c" => [MRUBY_CONFIG] do |t|
+    file "#{build_dir}/mrbgems/gem_init.c" => [MRUBY_CONFIGS].flatten do |t|
       FileUtils.mkdir_p "#{build_dir}/mrbgems"
       open(t.name, 'w') do |f|
         f.puts %Q[/*]

tasks/mruby_build.rake

@@ -53,43 +53,37 @@ module MRuby
     Exts = Struct.new(:object, :executable, :library)
 
     def initialize(name='host', &block)
-      MRuby::Build.current = self
-      @name = name
-      @root = File.expand_path("#{File.dirname(__FILE__)}/..")
+      @name = name.to_s
 
-      if ENV['OS'] == 'Windows_NT'
-        @exts = Exts.new('.o', '.exe', '.a')
-      else
-        @exts = Exts.new('.o', '', '.a')
-      end
-
-      @file_separator = '/'
-      @cc = Command::Compiler.new(self, %w(.c))
-      @cxx = Command::Compiler.new(self, %w(.cc .cxx .cpp))
-      @objc = Command::Compiler.new(self, %w(.m))
-      @asm = Command::Compiler.new(self, %w(.S .asm))
-      @linker = Command::Linker.new(self)
-      @archiver = Command::Archiver.new(self)
-      @yacc = Command::Yacc.new(self)
-      @gperf = Command::Gperf.new(self)
-      @git = Command::Git.new(self)
-      @mrbc = Command::Mrbc.new(self)
-
-      @bins = %w(mruby mrbc mirb)
-      @gems, @libmruby = [], []
-
-      MRuby.targets[name.to_s] = self
-
-      instance_eval(&block)
+      unless MRuby.targets[@name]
+        @root = File.expand_path("#{File.dirname(__FILE__)}/..")
 
-      compilers.each do |compiler|
-        if respond_to?(:enable_gems?) && enable_gems?
-          compiler.defines -= %w(DISABLE_GEMS) 
+        if ENV['OS'] == 'Windows_NT'
+          @exts = Exts.new('.o', '.exe', '.a')
         else
-          compiler.defines += %w(DISABLE_GEMS) 
+          @exts = Exts.new('.o', '', '.a')
         end
-        compiler.define_rules build_dir
+
+        @file_separator = '/'
+        @cc = Command::Compiler.new(self, %w(.c))
+        @cxx = Command::Compiler.new(self, %w(.cc .cxx .cpp))
+        @objc = Command::Compiler.new(self, %w(.m))
+        @asm = Command::Compiler.new(self, %w(.S .asm))
+        @linker = Command::Linker.new(self)
+        @archiver = Command::Archiver.new(self)
+        @yacc = Command::Yacc.new(self)
+        @gperf = Command::Gperf.new(self)
+        @git = Command::Git.new(self)
+        @mrbc = Command::Mrbc.new(self)
+
+        @bins = %w(mruby mrbc mirb)
+        @gems, @libmruby = [], []
+
+        MRuby.targets[@name] = self
       end
+
+      MRuby::Build.current = MRuby.targets[@name]
+      MRuby.targets[@name].instance_eval(&block)
     end
 
     def toolchain(name)
@@ -112,6 +106,17 @@ module MRuby
       end
     end
 
+    def define_rules
+      compilers.each do |compiler|
+        if respond_to?(:enable_gems?) && enable_gems?
+          compiler.defines -= %w(DISABLE_GEMS) 
+        else
+          compiler.defines += %w(DISABLE_GEMS) 
+        end
+        compiler.define_rules build_dir
+      end
+    end
+
     def filename(name)
       if name.is_a?(Array)
         name.flatten.map { |n| filename(n) }

tasks/mruby_build_commands.rake

@@ -36,14 +36,14 @@ module MRuby
 
     def initialize(build, source_exts=[])
       super(build)
-      @command = ENV['CC'] || 'gcc'
+      @command = ENV['CC'] || 'cc'
       @flags = [ENV['CFLAGS'] || []]
       @source_exts = source_exts
       @include_paths = ["#{build.root}/include"]
       @defines = %w()
       @option_include_path = '-I%s'
       @option_define = '-D%s'
-      @compile_options = "%{flags} -MMD -o %{outfile} -c %{infile}"
+      @compile_options = '%{flags} -o %{outfile} -c %{infile}'
     end
 
     def all_flags(_defineds=[], _include_paths=[], _flags=[])
@@ -111,7 +111,7 @@ module MRuby
 
     def initialize(build)
       super
-      @command = ENV['LD'] || 'gcc'
+      @command = ENV['LD'] || 'ld'
       @flags = (ENV['LDFLAGS'] || [])
       @flags_before_libraries, @flags_after_libraries = [], []
       @libraries = []

tasks/toolchains/clang.rake

 MRuby::Toolchain.new(:clang) do |conf|
   toolchain :gcc
 
-  [conf.cc, conf.cxx, conf.objc].each do |cc|
+  [conf.cc, conf.cxx, conf.objc, conf.asm].each do |cc|
     cc.command = ENV['CC'] || 'clang'
   end
   conf.linker.command = ENV['LD'] || 'clang'

tasks/toolchains/gcc.rake

 MRuby::Toolchain.new(:gcc) do |conf|
-  [conf.cc, conf.cxx, conf.objc].each do |cc|
+  [conf.cc, conf.cxx, conf.objc, conf.asm].each do |cc|
     cc.command = ENV['CC'] || 'gcc'
     cc.flags = [ENV['CFLAGS'] || %w(-g -O3 -Wall -Werror-implicit-function-declaration)]
     cc.include_paths = ["#{root}/include"]