summaryrefslogtreecommitdiffhomepage
path: root/Rakefile
diff options
context:
space:
mode:
authorYukihiro Matz Matsumoto <[email protected]>2013-03-11 23:57:53 +0900
committerYukihiro Matz Matsumoto <[email protected]>2013-03-11 23:57:53 +0900
commit5e02ddfec0ad166824909caecb66995bceef22be (patch)
tree560ef794296ccece6ecd29026413bcbf8362e850 /Rakefile
parent577a88161e49698de3a31b31e53ad504d1d19067 (diff)
parentd41e13e25dc584144bb4f62515c9d5fecbdfe95c (diff)
downloadmruby-5e02ddfec0ad166824909caecb66995bceef22be.tar.gz
mruby-5e02ddfec0ad166824909caecb66995bceef22be.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'Rakefile')
-rw-r--r--Rakefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Rakefile b/Rakefile
index b910e824a..9c0711453 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,10 +9,8 @@ load "#{MRUBY_ROOT}/tasks/mruby_build.rake"
load "#{MRUBY_ROOT}/tasks/mrbgem_spec.rake"
# load configuration file
-MRUBY_CONFIGS = ["#{MRUBY_ROOT}/build_config.rb", ENV['MRUBY_CONFIG']].compact
-MRUBY_CONFIGS.each do |config|
- load config unless config.empty?
-end
+MRUBY_CONFIG = (ENV['MRUBY_CONFIG'] && ENV['MRUBY_CONFIG'] != '') ? ENV['MRUBY_CONFIG'] : "#{MRUBY_ROOT}/build_config.rb"
+load MRUBY_CONFIG
# load basic rules
MRuby.each_target do |build|