diff -Naur node-v12.17.0/tools/gyp/pylib/gyp/xcode_emulation.py node-v12.17.0+iPhone/tools/gyp/pylib/gyp/xcode_emulation.py --- node-v12.17.0/tools/gyp/pylib/gyp/xcode_emulation.py 2020-05-26 04:53:35.000000000 -0700 +++ node-v12.17.0+iPhone/tools/gyp/pylib/gyp/xcode_emulation.py 2020-05-27 20:15:11.000000000 -0700 @@ -504,9 +504,10 @@ pass def _SdkRoot(self, configname): - if configname is None: - configname = self.configname - return self.GetPerConfigSetting('SDKROOT', configname, default='') + return '' +# if configname is None: +# configname = self.configname +# return self.GetPerConfigSetting('SDKROOT', configname, default='') def _XcodePlatformPath(self, configname=None): sdk_root = self._SdkRoot(configname) @@ -531,16 +532,17 @@ return XcodeSettings._sdk_path_cache[sdk_root] def _AppendPlatformVersionMinFlags(self, lst): - self._Appendf(lst, 'MACOSX_DEPLOYMENT_TARGET', '-mmacosx-version-min=%s') - if 'IPHONEOS_DEPLOYMENT_TARGET' in self._Settings(): - # TODO: Implement this better? - sdk_path_basename = os.path.basename(self._SdkPath()) - if sdk_path_basename.lower().startswith('iphonesimulator'): - self._Appendf(lst, 'IPHONEOS_DEPLOYMENT_TARGET', - '-mios-simulator-version-min=%s') - else: - self._Appendf(lst, 'IPHONEOS_DEPLOYMENT_TARGET', - '-miphoneos-version-min=%s') + True +# self._Appendf(lst, 'MACOSX_DEPLOYMENT_TARGET', '-mmacosx-version-min=%s') +# if 'IPHONEOS_DEPLOYMENT_TARGET' in self._Settings(): +# # TODO: Implement this better? +# sdk_path_basename = os.path.basename(self._SdkPath()) +# if sdk_path_basename.lower().startswith('iphonesimulator'): +# self._Appendf(lst, 'IPHONEOS_DEPLOYMENT_TARGET', +# '-mios-simulator-version-min=%s') +# else: +# self._Appendf(lst, 'IPHONEOS_DEPLOYMENT_TARGET', +# '-miphoneos-version-min=%s') def GetCflags(self, configname, arch=None): """Returns flags that need to be added to .c, .cc, .m, and .mm @@ -552,8 +554,8 @@ cflags = [] sdk_root = self._SdkPath() - if 'SDKROOT' in self._Settings() and sdk_root: - cflags.append('-isysroot %s' % sdk_root) +# if 'SDKROOT' in self._Settings() and sdk_root: +# cflags.append('-isysroot %s' % sdk_root) if self.header_map_path: cflags.append('-I%s' % self.header_map_path) @@ -877,8 +879,8 @@ self._AppendPlatformVersionMinFlags(ldflags) - if 'SDKROOT' in self._Settings() and self._SdkPath(): - ldflags.append('-isysroot ' + self._SdkPath()) +# if 'SDKROOT' in self._Settings() and self._SdkPath(): +# ldflags.append('-isysroot ' + self._SdkPath()) for library_path in self._Settings().get('LIBRARY_SEARCH_PATHS', []): ldflags.append('-L' + gyp_to_build_path(library_path)) @@ -1414,7 +1416,7 @@ except GypError: # Xcode not installed so look for XCode Command Line Tools version = CLTVersion() # macOS Catalina returns 11.0.0.0.1.1567737322 if not version: - raise GypError("No Xcode or CLT version detected!") + version = '10.6' # Be careful to convert "4.2.3" to "0423" and "11.0.0" to "1100": version = version.split(".")[:3] # Just major, minor, micro version[0] = version[0].zfill(2) # Add a leading zero if major is one digit