diff options
Diffstat (limited to 'data/nodejs/xcode_emulation.diff')
| -rw-r--r-- | data/nodejs/xcode_emulation.diff | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/data/nodejs/xcode_emulation.diff b/data/nodejs/xcode_emulation.diff index 527523dc2..79f976c12 100644 --- a/data/nodejs/xcode_emulation.diff +++ b/data/nodejs/xcode_emulation.diff @@ -1,7 +1,7 @@ -diff -ur node-chakracore-node-v10.13.0/tools/gyp/pylib/gyp/xcode_emulation.py node-chakracore-node-v10.13.0+iPhone/tools/gyp/pylib/gyp/xcode_emulation.py ---- node-chakracore-node-v10.13.0/tools/gyp/pylib/gyp/xcode_emulation.py 2018-11-17 00:31:08.000000000 +0000 -+++ node-chakracore-node-v10.13.0+iPhone/tools/gyp/pylib/gyp/xcode_emulation.py 2019-05-16 21:41:49.953754405 +0000 -@@ -500,9 +500,10 @@ +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): @@ -15,7 +15,7 @@ diff -ur node-chakracore-node-v10.13.0/tools/gyp/pylib/gyp/xcode_emulation.py no def _XcodePlatformPath(self, configname=None): sdk_root = self._SdkRoot(configname) -@@ -527,16 +528,17 @@ +@@ -531,16 +532,17 @@ return XcodeSettings._sdk_path_cache[sdk_root] def _AppendPlatformVersionMinFlags(self, lst): @@ -43,7 +43,7 @@ diff -ur node-chakracore-node-v10.13.0/tools/gyp/pylib/gyp/xcode_emulation.py no def GetCflags(self, configname, arch=None): """Returns flags that need to be added to .c, .cc, .m, and .mm -@@ -548,8 +550,8 @@ +@@ -552,8 +554,8 @@ cflags = [] sdk_root = self._SdkPath() @@ -54,7 +54,7 @@ diff -ur node-chakracore-node-v10.13.0/tools/gyp/pylib/gyp/xcode_emulation.py no if self.header_map_path: cflags.append('-I%s' % self.header_map_path) -@@ -873,8 +875,8 @@ +@@ -877,8 +879,8 @@ self._AppendPlatformVersionMinFlags(ldflags) @@ -65,13 +65,12 @@ diff -ur node-chakracore-node-v10.13.0/tools/gyp/pylib/gyp/xcode_emulation.py no for library_path in self._Settings().get('LIBRARY_SEARCH_PATHS', []): ldflags.append('-L' + gyp_to_build_path(library_path)) -@@ -1407,7 +1409,8 @@ - if version: - version = re.match(r'(\d+\.\d+\.?\d*)', version).groups()[0] - else: +@@ -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' -+# raise GypError("No Xcode or CLT version detected!") - # The CLT has no build information, so we return an empty string. - version_list = [version, ''] - version = version_list[0] + # 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 |