From d90abc648e69cf84defe0dc3d9b6f8663343fb8b Mon Sep 17 00:00:00 2001
From: KOBAYASHI Shuji <shuujii@gmail.com>
Date: Sun, 31 Jan 2021 15:08:37 +0900
Subject: Change `.o.d` back to `.d` because `.pi.d` is no longer created

---
 lib/mruby/build/command.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/mruby/build/command.rb b/lib/mruby/build/command.rb
index 9362a9d95..4e9f7297f 100644
--- a/lib/mruby/build/command.rb
+++ b/lib/mruby/build/command.rb
@@ -87,7 +87,7 @@ module MRuby
     def run(outfile, infile, _defines=[], _include_paths=[], _flags=[])
       mkdir_p File.dirname(outfile)
       flags = all_flags(_defines, _include_paths, _flags)
-      if File.extname(outfile) == build.exts.object
+      if object_ext?(outfile)
         label = @label
         opts = compile_options
       else
@@ -157,8 +157,8 @@ module MRuby
     #   /src/value_array.h:
     #
     def get_dependencies(file)
-      dep_file = "#{file}.d"
-      return [MRUBY_CONFIG] unless File.exist?(dep_file)
+      dep_file = file.ext(".d")
+      return [MRUBY_CONFIG] unless object_ext?(file) && File.exist?(dep_file)
 
       deps = File.read(dep_file).gsub("\\\n ", "").split("\n").map do |dep_line|
         # dep_line:
@@ -172,6 +172,10 @@ module MRuby
       end.flatten.uniq
       deps << MRUBY_CONFIG
     end
+
+    def object_ext?(path)
+      File.extname(path) == build.exts.object
+    end
   end
 
   class Command::Linker < Command
-- 
cgit v1.2.3