diff options
| author | Abinoam Praxedes Marques Junior <[email protected]> | 2020-11-22 20:02:45 -0300 |
|---|---|---|
| committer | Abinoam Praxedes Marques Junior <[email protected]> | 2020-11-23 15:18:22 -0300 |
| commit | 4803c872e2df4b0764e8eeeee1a00470265d65b0 (patch) | |
| tree | fe8c16338e8d064d8b80946b8bdde3500b3dcb80 | |
| parent | 39a11f323e26879d1101e31859ddb20068f12d56 (diff) | |
| download | mruby-4803c872e2df4b0764e8eeeee1a00470265d65b0.tar.gz mruby-4803c872e2df4b0764e8eeeee1a00470265d65b0.zip | |
Fix #5177 - set MRUBY_CONFIG early
| -rw-r--r-- | Rakefile | 3 | ||||
| -rw-r--r-- | lib/mruby/build.rb | 3 |
2 files changed, 3 insertions, 3 deletions
@@ -14,7 +14,8 @@ require "mruby/core_ext" require "mruby/build" # load configuration file -MRUBY_CONFIG = MRuby::Build.load_config +MRUBY_CONFIG = MRuby::Build.mruby_config_path +load MRUBY_CONFIG # load basic rules MRuby.each_target do |build| diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb index 4af639e3f..d01d417de 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb @@ -39,7 +39,7 @@ module MRuby class Build class << self attr_accessor :current - def load_config + def mruby_config_path path = ENV['MRUBY_CONFIG'] || ENV['CONFIG'] if path.nil? || path.empty? path = "#{MRUBY_ROOT}/build_config/default.rb" @@ -47,7 +47,6 @@ module MRuby f = "#{MRUBY_ROOT}/build_config/#{path}.rb" path = File.exist?(f) ? f : File.extname(path).empty? ? f : path end - load path path end end |