Commit 8b29f0d9 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto

Merge pull request #1729 from take-cheeze/customizable_build_dir

Make mruby build directory customizable.
parents 37348c29 9059b9a3
...@@ -52,7 +52,7 @@ module MRuby ...@@ -52,7 +52,7 @@ module MRuby
Exts = Struct.new(:object, :executable, :library) Exts = Struct.new(:object, :executable, :library)
def initialize(name='host', &block) def initialize(name='host', build_dir=nil, &block)
@name = name.to_s @name = name.to_s
unless MRuby.targets[@name] unless MRuby.targets[@name]
...@@ -62,9 +62,11 @@ module MRuby ...@@ -62,9 +62,11 @@ module MRuby
@exts = Exts.new('.o', '', '.a') @exts = Exts.new('.o', '', '.a')
end end
build_dir = build_dir || ENV['MRUBY_BUILD_DIR'] || "#{MRUBY_ROOT}/build"
@file_separator = '/' @file_separator = '/'
@build_dir = "#{MRUBY_ROOT}/build/#{@name}" @build_dir = "#{build_dir}/#{@name}"
@gem_clone_dir = "#{MRUBY_ROOT}/build/mrbgems" @gem_clone_dir = "#{build_dir}/mrbgems"
@cc = Command::Compiler.new(self, %w(.c)) @cc = Command::Compiler.new(self, %w(.c))
@cxx = Command::Compiler.new(self, %w(.cc .cxx .cpp)) @cxx = Command::Compiler.new(self, %w(.cc .cxx .cpp))
@objc = Command::Compiler.new(self, %w(.m)) @objc = Command::Compiler.new(self, %w(.m))
...@@ -204,7 +206,7 @@ module MRuby ...@@ -204,7 +206,7 @@ module MRuby
class CrossBuild < Build class CrossBuild < Build
attr_block %w(test_runner) attr_block %w(test_runner)
def initialize(name, &block) def initialize(name, build_dir=nil, &block)
@test_runner = Command::CrossTestRunner.new(self) @test_runner = Command::CrossTestRunner.new(self)
super super
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment