WIP 5

2 files changed, 24 insertions, 24 deletions

diff --git a/data/node/configure-ios.diff b/data/node/configure-ios.diff
index c81403d5a..59c6d1fa5 100644
--- a/data/node/configure-ios.diff
+++ b/data/node/configure-ios.diff
@@ -255,26 +255,17 @@ diff -ur node-v12.2.0/deps/uv/uv.gyp node-v12.2.0+iPhone/deps/uv/uv.gyp
                # in include/uv/version.h
 diff -ur node-v12.2.0/node.gyp node-v12.2.0+iPhone/node.gyp
 --- node-v12.2.0/node.gyp	2019-05-07 14:52:15.000000000 +0000
-+++ node-v12.2.0+iPhone/node.gyp	2019-05-23 07:48:01.767172790 +0000
-@@ -656,6 +656,17 @@
-         'common.gypi',
-       ],
- 
-+      'conditions': [
-+        ['node_use_node_snapshot=="false" and OS=="ios"', {
-+          # XXX(mac): Is this really needed?
-+          # According to configure.py, code_cache is broken when cross compiling.
-+          'sources': [
-+            'src/node_snapshot_stub.cc',
-+            'src/node_code_cache_stub.cc',
-+          ],
-+        }],
-+      ],
-+
-       'variables': {
-         'openssl_system_ca_path%': '',
-       },
-@@ -760,7 +771,7 @@
++++ node-v12.2.0+iPhone/node.gyp	2019-05-23 13:53:05.318455172 +0000
+@@ -545,6 +545,8 @@
+         'src/node_watchdog.cc',
+         'src/node_worker.cc',
+         'src/node_zlib.cc',
++        'src/node_snapshot_stub.cc',
++        'src/node_code_cache_stub.cc',
+         'src/pipe_wrap.cc',
+         'src/process_wrap.cc',
+         'src/sharedarraybuffer_metadata.cc',
+@@ -760,7 +762,7 @@
                  '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o'
                ],
              }],
@@ -283,7 +274,7 @@ diff -ur node-v12.2.0/node.gyp node-v12.2.0+iPhone/node.gyp
                'sources': [
                  'src/node_dtrace_ustack.cc',
                  'src/node_dtrace_provider.cc',
-@@ -938,7 +949,7 @@
+@@ -938,7 +940,7 @@
        'target_name': 'node_dtrace_provider',
        'type': 'none',
        'conditions': [
@@ -292,7 +283,7 @@ diff -ur node-v12.2.0/node.gyp node-v12.2.0+iPhone/node.gyp
            'actions': [
              {
                'action_name': 'node_dtrace_provider_o',
-@@ -973,7 +984,7 @@
+@@ -973,7 +975,7 @@
        'target_name': 'node_dtrace_ustack',
        'type': 'none',
        'conditions': [
diff --git a/data/node/v8.diff b/data/node/v8.diff
index 9b801e55a..7ed407a0e 100644
--- a/data/node/v8.diff
+++ b/data/node/v8.diff
@@ -1,6 +1,6 @@
 diff -ur node-v12.2.0/tools/v8_gypfiles/toolchain.gypi node-v12.2.0+iPhone/tools/v8_gypfiles/toolchain.gypi
 --- node-v12.2.0/tools/v8_gypfiles/toolchain.gypi	2019-05-07 14:52:17.000000000 +0000
-+++ node-v12.2.0+iPhone/tools/v8_gypfiles/toolchain.gypi	2019-05-22 14:09:36.491652492 +0000
++++ node-v12.2.0+iPhone/tools/v8_gypfiles/toolchain.gypi	2019-05-23 17:52:51.039689961 +0000
 @@ -84,7 +84,9 @@
      # The setting is ignored if want_separate_host_toolset is 0.
      'v8_toolset_for_shell%': 'target',
@@ -77,7 +77,7 @@ diff -ur node-v12.2.0/tools/v8_gypfiles/toolchain.gypi node-v12.2.0+iPhone/tools
  
 diff -ur node-v12.2.0/tools/v8_gypfiles/v8.gyp node-v12.2.0+iPhone/tools/v8_gypfiles/v8.gyp
 --- node-v12.2.0/tools/v8_gypfiles/v8.gyp	2019-05-07 14:52:17.000000000 +0000
-+++ node-v12.2.0+iPhone/tools/v8_gypfiles/v8.gyp	2019-05-22 15:21:50.389972067 +0000
++++ node-v12.2.0+iPhone/tools/v8_gypfiles/v8.gyp	2019-05-23 17:57:07.199852911 +0000
 @@ -123,7 +123,7 @@
              ],
            },
@@ -96,6 +96,15 @@ diff -ur node-v12.2.0/tools/v8_gypfiles/v8.gyp node-v12.2.0+iPhone/tools/v8_gypf
              'sources': [
                '<(V8_ROOT)/src/trap-handler/handler-inside-posix.cc',
                '<(V8_ROOT)/src/trap-handler/handler-inside-posix.h',
+@@ -2221,7 +2221,7 @@
+         }],
+       ],
+       'conditions': [
+-        ['OS=="linux"', {
++        ['OS=="linux" or (host_os=="linux" and _toolset=="host")', {
+             'link_settings': {
+               'libraries': [
+                 '-ldl',
 @@ -2296,15 +2296,38 @@
              '<(V8_ROOT)/src/base/platform/platform-fuchsia.cc',
            ]},