diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2020-11-24 09:44:21 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-11-24 09:44:21 +0900 |
| commit | 67f3626b5c74d60de78262021ab50e8685015898 (patch) | |
| tree | f4c93592b052257bbb235e3477be693b9b9c87dc /lib | |
| parent | e4e4eeb0c3f9d2b2754676b9b5b7b7b9d341f610 (diff) | |
| parent | 4803c872e2df4b0764e8eeeee1a00470265d65b0 (diff) | |
| download | mruby-67f3626b5c74d60de78262021ab50e8685015898.tar.gz mruby-67f3626b5c74d60de78262021ab50e8685015898.zip | |
Merge pull request #5178 from abinoam/fix_mruby_config_setting
Fix #5177 by setting MRUBY_CONFIG early
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mruby/build.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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 |