summaryrefslogtreecommitdiffhomepage
path: root/lib
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2020-10-29 11:32:46 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2020-10-29 11:49:05 +0900
commit33742d941ff3e8e361c6d3a36071765b686cb94c (patch)
tree559479c20b7efe532c4712090446b38de4f63dc4 /lib
parentc1ad4c42616943c25a2f9a17626e820aea6a31b7 (diff)
downloadmruby-33742d941ff3e8e361c6d3a36071765b686cb94c.tar.gz
mruby-33742d941ff3e8e361c6d3a36071765b686cb94c.zip
Move `build_config.rb` -> `build_config/default.rb`; ref #5098
In addition, update the documents referring `build_config.rb` which is no longer used. The new `build_config.rb` describes the new configuration structure in the comment.
Diffstat (limited to 'lib')
-rw-r--r--lib/mruby/build.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb
index d07890621..c9a7097b5 100644
--- a/lib/mruby/build.rb
+++ b/lib/mruby/build.rb
@@ -40,9 +40,9 @@ module MRuby
class << self
attr_accessor :current
def load_config
- path = ENV['MRUBY_CONFIG']
+ path = ENV['MRUBY_CONFIG'] || ENV['CONFIG']
if path.nil? || path.empty?
- path = "#{MRUBY_ROOT}/build_config.rb"
+ path = "#{MRUBY_ROOT}/build_config/default.rb"
elsif !File.file?(path) && !Pathname.new(path).absolute?
f = "#{MRUBY_ROOT}/build_config/#{path}.rb"
path = File.exist?(f) ? f : File.extname(path).empty? ? f : path