Merge pull request #5098 from shuujii/revert-MRUBY_TARGET-mechanism

Revert `MRUBY_TARGET` mechanism; ref #5096

2 files changed, 12 insertions, 1 deletions

diff --git a/lib/mruby/build.rb b/lib/mruby/build.rb
index fa3853342..d07890621 100644
--- a/lib/mruby/build.rb
+++ b/lib/mruby/build.rb
@@ -39,6 +39,17 @@ module MRuby
   class Build
     class << self
       attr_accessor :current
+      def load_config
+        path = ENV['MRUBY_CONFIG']
+        if path.nil? || path.empty?
+          path = "#{MRUBY_ROOT}/build_config.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
+        end
+        load path
+        path
+      end
     end
     include Rake::DSL
     include LoadGems
diff --git a/lib/mruby/lockfile.rb b/lib/mruby/lockfile.rb
index 5d4313649..5abf804b4 100644
--- a/lib/mruby/lockfile.rb
+++ b/lib/mruby/lockfile.rb
@@ -26,7 +26,7 @@ module MRuby
       end
 
       def instance
-        @instance ||= new("#{MRUBY_ROOT}/build/#{MRUBY_TARGET}.lock")
+        @instance ||= new("#{MRUBY_CONFIG}.lock")
       end
     end