From 7cfbcc3599e85f8489c558247ba59dc90a680db3 Mon Sep 17 00:00:00 2001 From: buty4649 Date: Fri, 1 Aug 2025 14:06:19 +0900 Subject: [PATCH 1/2] fix: skip local build_config.rb when working in MRUBY_ROOT Only use local build_config.rb when current directory != MRUBY_ROOT. --- lib/mruby/build.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb index 9cd36aae6..118660be0 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb @@ -60,7 +60,11 @@ module MRuby def mruby_config_path path = ENV['MRUBY_CONFIG'] || ENV['CONFIG'] if path.nil? || path.empty? - path = File.file?("./build_config.rb") ? "./build_config.rb" : "#{MRUBY_ROOT}/build_config/default.rb" + if Dir.pwd != MRUBY_ROOT && File.file?("./build_config.rb") + path = "./build_config.rb" + else + path = "#{MRUBY_ROOT}/build_config/default.rb" + end 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 From 8381a5e4032ba30179903f2ef379580be5363eb3 Mon Sep 17 00:00:00 2001 From: buty4649 Date: Fri, 1 Aug 2025 14:15:21 +0900 Subject: [PATCH 2/2] refactor: use inline conditional for build config path assignment Suggested by Gemini code assistant for better readability. --- lib/mruby/build.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb index 118660be0..ed4610840 100644 --- a/lib/mruby/build.rb +++ b/lib/mruby/build.rb @@ -60,10 +60,10 @@ module MRuby def mruby_config_path path = ENV['MRUBY_CONFIG'] || ENV['CONFIG'] if path.nil? || path.empty? - if Dir.pwd != MRUBY_ROOT && File.file?("./build_config.rb") - path = "./build_config.rb" + path = if Dir.pwd != MRUBY_ROOT && File.file?("./build_config.rb") + "./build_config.rb" else - path = "#{MRUBY_ROOT}/build_config/default.rb" + "#{MRUBY_ROOT}/build_config/default.rb" end elsif !File.file?(path) && !Pathname.new(path).absolute? f = "#{MRUBY_ROOT}/build_config/#{path}.rb"