diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-01-22 10:47:37 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-01-22 10:47:37 +0900 |
| commit | 3a95e3fbbdd832acb465e736d30d487785e027e8 (patch) | |
| tree | 9d96036e783ab1526550863c9d2bca249f068aa9 /tasks/mruby_build.rake | |
| parent | 323d8501d64d5cb2fb176e240c06ebfebebf62e0 (diff) | |
| parent | 461a03ca06bd82328ffd3b8d98f9c88a028c893e (diff) | |
| download | mruby-3a95e3fbbdd832acb465e736d30d487785e027e8.tar.gz mruby-3a95e3fbbdd832acb465e736d30d487785e027e8.zip | |
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'tasks/mruby_build.rake')
| -rw-r--r-- | tasks/mruby_build.rake | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake index 3ce2f4992..711f7f024 100644 --- a/tasks/mruby_build.rake +++ b/tasks/mruby_build.rake @@ -29,10 +29,6 @@ module MRuby conf.instance_eval(&@initializer) end - def toolchain(name) - @@toolchains[name.to_s].setup(self) - end - def self.load Dir.glob("#{File.dirname(__FILE__)}/toolchains/*.rake").each do |file| Kernel.load file @@ -63,12 +59,11 @@ module MRuby if ENV['OS'] == 'Windows_NT' @exts = Exts.new('.o', '.exe', '.a') - @file_separator = '\\' else @exts = Exts.new('.o', '', '.a') - @file_separator = '/' 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)) @@ -94,7 +89,9 @@ module MRuby end def toolchain(name) - Toolchain.toolchains[name.to_s].setup(self) + tc = Toolchain.toolchains[name.to_s] + fail "Unknown #{name} toolchain" unless tc + tc.setup(self) end def build_dir |