From aae9d399394282a72012778c4ed9f93be5cae74a Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 16 Oct 2019 16:26:57 +0100
Subject: [PATCH] os/mac/xcode: fallback to clang version for detecting CLT.

For some reason `pkgutil --pkgs` no longer lists the CLT after the
Catalina supplemental update.

Fixes https://github.com/Homebrew/brew/issues/6610
---
 Library/Homebrew/os/mac/xcode.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index ad51e33fc3..651896cfbc 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -320,9 +320,10 @@ module OS
           next unless File.exist?("#{PKG_PATH}/usr/bin/clang")
 
           version = MacOS.pkgutil_info(id)[/version: (.+)$/, 1]
-          break if version
+          return version if version
         end
-        version
+
+        detect_clang_version
       end
     end
   end