···

       
1
       
1
       
-
       
diff -Naur node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py

     

       
2
       
2
       
-
       
--- node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py	2020-09-15 09:08:46.000000000 +0200

     

       
3
       
3
       
-
       
+++ node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py	2020-12-03 16:55:43.781860687 +0100

     

       
4
       
4
       
-
       
@@ -436,7 +436,14 @@

     

       
5
       
5
       
-
       
     # Since the CLT has no SDK paths anyway, returning None is the

     

       
6
       
6
       
-
       
     # most sensible route and should still do the right thing.

     

       
7
       
7
       
-
       
     try:

     

       
8
       
8
       
-
       
-      return GetStdoutQuiet(['xcodebuild', '-version', '-sdk', sdk, infoitem])

     

       
9
       
9
       
-
       
+      # Return fake data that xcodebuild would normally return

     

       
10
       
10
       
-
       
+

     

       
11
       
11
       
-
       
+      xcodedata = {

     

       
12
       
12
       
-
       
+        "Path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk",

     

       
13
       
13
       
-
       
+        "ProductBuildVersion": "19A547",

     

       
14
       
14
       
-
       
+        "ProductVersion": "10.15"

     

       
15
       
15
       
-
       
+      }

     

       
16
       
16
       
-
       
+      return xcodedata[infoitem]

     

       
17
       
17
       
-
       
     except GypError:

     

       
18
       
18
       
-
       
       pass

     

       
19
       
19
       
-
       
 

     

       
20
       
20
       
-
       
@@ -1271,7 +1278,7 @@

     

       
21
       
21
       
-
       
   version = ""

     

       
22
       
22
       
-
       
   build = ""

     

       
23
       
23
       
-
       
   try:

     

       
24
       
24
       
-
       
-    version_list = GetStdoutQuiet(['xcodebuild', '-version']).splitlines()

     

       
25
       
25
       
-
       
+    version_list = []

     

       
26
       
26
       
-
       
     # In some circumstances xcodebuild exits 0 but doesn't return

     

       
27
       
27
       
-
       
     # the right results; for example, a user on 10.7 or 10.8 with

     

       
28
       
28
       
-
       
     # a bogus path set via xcode-select