at master 940 B view raw
1--- gyp-old/pylib/gyp/xcode_emulation.py 1980-01-02 00:00:00.000000000 -0600 2+++ gyp/pylib/gyp/xcode_emulation.py 2020-08-02 20:24:24.871322520 -0500 3@@ -1407,10 +1407,10 @@ 4 raise GypError("xcodebuild returned unexpected results") 5 except: 6 version = CLTVersion() 7- if version: 8+ if version and re.match(r'(\d\.\d\.?\d*)', version): 9 version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0] 10 else: 11- raise GypError("No Xcode or CLT version detected!") 12+ version = '7.0.0' 13 # The CLT has no build information, so we return an empty string. 14 version_list = [version, ''] 15 version = version_list[0] 16@@ -1667,7 +1667,8 @@ 17 sdk_root = xcode_settings._SdkRoot(configuration) 18 if not sdk_root: 19 sdk_root = xcode_settings._XcodeSdkPath('') 20- env['SDKROOT'] = sdk_root 21+ if not sdk_root: 22+ env['SDKROOT'] = '' 23 24 if not additional_settings: 25 additional_settings = {}