--- node-v12.8.1-orig/node.gyp	2019-08-15 11:09:22.000000000 +0200
+++ node-v12.8.1-orig/node.gyp	2019-08-22 00:01:24.066158792 +0200
@@ -230,6 +230,8 @@ 
     ],
     'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
     'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
+    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
+    'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
     'conditions': [
       [ 'node_shared=="true"', {
         'node_target_type%': 'shared_library',
@@ -1171,7 +1173,7 @@ 
     # So generate_code_cache -> mkcodecache -> node_lib_base,
     #    node_lib -> node_lib_base & generate_code_cache
     {
-      'target_name': 'mkcodecache',
+      'target_name': 'mkcodecache_u',
       'type': 'executable',
 
       'dependencies': [
@@ -1212,9 +1214,9 @@ 
           ],
         }],
       ],
-    }, # mkcodecache
+    }, # mkcodecache_u
     {
-      'target_name': 'node_mksnapshot',
+      'target_name': 'node_mksnapshot_u',
       'type': 'executable',
 
       'dependencies': [
@@ -1253,6 +1255,48 @@ 
           ],
         }],
       ],
+    }, # node_mksnapshot_u
+    {
+      'target_name': 'mkcodecache',
+      'type': 'none',
+      'dependencies': ['mkcodecache_u'],
+      'actions': [
+        {
+          'action_name': 'mkcodecache',
+          'inputs': [
+            '<(mkcodecache_u_exec)',
+          ],
+          'outputs': [
+            '<(mkcodecache_exec)',
+          ],
+          'action': [
+            'bash',
+            '-c',
+            'cp <(mkcodecache_u_exec) <(mkcodecache_exec) && paxmark.sh m <(mkcodecache_exec)',
+          ],
+        },
+      ],
+    }, # mkcodecache
+    {
+      'target_name': 'node_mksnapshot',
+      'type': 'none',
+      'dependencies': ['node_mksnapshot_u'],
+      'actions': [
+        {
+          'action_name': 'node_mksnapshot',
+          'inputs': [
+            '<(node_mksnapshot_u_exec)',
+          ],
+          'outputs': [
+            '<(node_mksnapshot_exec)',
+          ],
+          'action': [
+            'bash',
+            '-c',
+            'cp <(node_mksnapshot_u_exec) <(node_mksnapshot_exec) && paxmark.sh m <(node_mksnapshot_exec)',
+          ],
+        },
+      ],
     }, # node_mksnapshot
   ], # end targets