diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 525fc58f9c..e023501b22 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -3067,7 +3067,9 @@ class Formula
                    cmd_base:   File.basename(cmd).split.first)
     logs.mkpath
 
-    File.open(logfn, "w") do |log|
+    # Append `.log` here instead of in the definition of `logfn` to avoid
+    # log files named `xy.cmake.log.cc.log` from `shims/super/cc`.
+    File.open("#{logfn}.log", "w") do |log|
       log.puts Time.now, "", cmd, args, ""
       log.flush
 
diff --git a/Library/Homebrew/shims/super/cc b/Library/Homebrew/shims/super/cc
index 1bb5950b39..ce8505b08f 100755
--- a/Library/Homebrew/shims/super/cc
+++ b/Library/Homebrew/shims/super/cc
@@ -532,7 +532,7 @@ def log(basename, argv, tool, args)
   s << "superenv removed:  #{dels.join(" ")}\n" unless dels.empty?
   s << "superenv added:    #{adds.join(" ")}\n" unless adds.empty?
   s << "superenv executed: #{tool} #{args.join(" ")}\n\n"
-  File.open("#{ENV["HOMEBREW_CC_LOG_PATH"]}.cc", "a+") { |f| f.write(s) }
+  File.open("#{ENV["HOMEBREW_CC_LOG_PATH"]}.cc.log", "a+") { |f| f.write(s) }
 end
 
 def remove_superbin_from_path(paths)