From 51a0dd93ab2c9cd8ca82203b4996860ad04980a3 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Tue, 2 Jun 2020 06:40:01 +0200
Subject: [PATCH] gyp: fix XCode CLT version detection on Catalina

Copies @szekelyisz nodejs/node-gyp#2141 to this repo.
---
 pylib/gyp/xcode_emulation.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py
index 9a717d90..e04717c9 100644
--- a/pylib/gyp/xcode_emulation.py
+++ b/pylib/gyp/xcode_emulation.py
@@ -1541,6 +1541,13 @@ def CLTVersion():
         except GypError:
             continue
 
+    regex = re.compile('Command Line Tools for Xcode\s+(?P<version>\S+)')
+    try:
+        output = GetStdout(['/usr/sbin/softwareupdate', '--history'])
+        return re.search(regex, output).groupdict()['version']
+    except GypError:
+        return None
+
 
 def GetStdoutQuiet(cmdlist):
     """Returns the content of standard output returned by invoking |cmdlist|.