Luke Granger-Brown
57725ef3ec
git-subtree-dir: third_party/nixpkgs git-subtree-split: 76612b17c0ce71689921ca12d9ffdc9c23ce40b2
146 lines
4.8 KiB
Diff
146 lines
4.8 KiB
Diff
From 999d918bc8fefec1752243743a47c0ce5380bcec Mon Sep 17 00:00:00 2001
|
||
From: Ivan Trubach <mr.trubach@icloud.com>
|
||
Date: Wed, 17 Jul 2024 10:16:02 +0300
|
||
Subject: [PATCH] build: support setting an emulator from configure script
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
V8’s JIT infrastructure requires binaries such as mksnapshot to be run
|
||
during the build. However, these binaries must have the same bit-width
|
||
as the host platform (e.g. a x86_64 build platform targeting ARMv6 needs
|
||
to produce a 32-bit binary).
|
||
|
||
To work around this issue, allow building the binaries for the host
|
||
platform and running them on the build platform with an emulator.
|
||
|
||
Based on Buildroot’s nodejs-src 0001-add-qemu-wrapper-support.patch.
|
||
https://gitlab.com/buildroot.org/buildroot/-/blob/c1d5eada4d4db9eeaa1c44dd1dea95a67c8a70ca/package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch
|
||
|
||
Upstream: https://github.com/nodejs/node/pull/53899
|
||
---
|
||
common.gypi | 1 +
|
||
configure.py | 14 ++++++++++++++
|
||
node.gyp | 4 ++++
|
||
tools/v8_gypfiles/v8.gyp | 4 ++++
|
||
4 files changed, 23 insertions(+)
|
||
|
||
diff --git a/common.gypi b/common.gypi
|
||
index 154bbf2a0d..54d2afe3b3 100644
|
||
--- a/common.gypi
|
||
+++ b/common.gypi
|
||
@@ -13,6 +13,7 @@
|
||
'enable_pgo_generate%': '0',
|
||
'enable_pgo_use%': '0',
|
||
'python%': 'python',
|
||
+ 'emulator%': [],
|
||
|
||
'node_shared%': 'false',
|
||
'force_dynamic_crt%': 0,
|
||
diff --git a/configure.py b/configure.py
|
||
index f7e3310723..f7c7acdf4f 100755
|
||
--- a/configure.py
|
||
+++ b/configure.py
|
||
@@ -112,6 +112,12 @@ parser.add_argument('--dest-cpu',
|
||
choices=valid_arch,
|
||
help=f"CPU architecture to build for ({', '.join(valid_arch)})")
|
||
|
||
+parser.add_argument('--emulator',
|
||
+ action='store',
|
||
+ dest='emulator',
|
||
+ default=None,
|
||
+ help='emulator command that can run executables built for the target system')
|
||
+
|
||
parser.add_argument('--cross-compiling',
|
||
action='store_true',
|
||
dest='cross_compiling',
|
||
@@ -2276,6 +2282,14 @@ if flavor == 'win' and python.lower().endswith('.exe'):
|
||
# will fail to run python scripts.
|
||
gyp_args += ['-Dpython=' + python]
|
||
|
||
+if options.emulator is not None:
|
||
+ if not options.cross_compiling:
|
||
+ # Note that emulator is a list so we have to quote the variable.
|
||
+ gyp_args += ['-Demulator=' + shlex.quote(options.emulator)]
|
||
+ else:
|
||
+ # TODO: perhaps use emulator for tests?
|
||
+ warn('The `--emulator` option has no effect when cross-compiling.')
|
||
+
|
||
if options.use_ninja:
|
||
gyp_args += ['-f', 'ninja-' + flavor]
|
||
elif flavor == 'win' and sys.platform != 'msys':
|
||
diff --git a/node.gyp b/node.gyp
|
||
index 9617596760..439c76aca6 100644
|
||
--- a/node.gyp
|
||
+++ b/node.gyp
|
||
@@ -703,6 +703,7 @@
|
||
'<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
|
||
],
|
||
'action': [
|
||
+ '<@(emulator)',
|
||
'<(node_mksnapshot_exec)',
|
||
'--build-snapshot',
|
||
'<(node_snapshot_main)',
|
||
@@ -722,6 +723,7 @@
|
||
'<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',
|
||
],
|
||
'action': [
|
||
+ '<@(emulator)',
|
||
'<@(_inputs)',
|
||
'<@(_outputs)',
|
||
],
|
||
@@ -1010,6 +1012,7 @@
|
||
'<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc',
|
||
],
|
||
'action': [
|
||
+ '<@(emulator)',
|
||
'<(node_js2c_exec)',
|
||
'<@(_outputs)',
|
||
'lib',
|
||
@@ -1477,6 +1480,7 @@
|
||
'<(PRODUCT_DIR)/<(node_core_target_name).def',
|
||
],
|
||
'action': [
|
||
+ '<@(emulator)',
|
||
'<(PRODUCT_DIR)/gen_node_def.exe',
|
||
'<@(_inputs)',
|
||
'<@(_outputs)',
|
||
diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
|
||
index d65a5c268e..5cd6c36b86 100644
|
||
--- a/tools/v8_gypfiles/v8.gyp
|
||
+++ b/tools/v8_gypfiles/v8.gyp
|
||
@@ -112,6 +112,7 @@
|
||
'<@(torque_outputs_inc)',
|
||
],
|
||
'action': [
|
||
+ '<@(emulator)',
|
||
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)',
|
||
'-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated',
|
||
'-v8-root', '<(V8_ROOT)',
|
||
@@ -232,6 +233,7 @@
|
||
'action': [
|
||
'<(python)',
|
||
'<(V8_ROOT)/tools/run.py',
|
||
+ '<@(emulator)',
|
||
'<@(_inputs)',
|
||
'<@(_outputs)',
|
||
],
|
||
@@ -453,6 +455,7 @@
|
||
}],
|
||
],
|
||
'action': [
|
||
+ '<@(emulator)',
|
||
'>@(_inputs)',
|
||
'>@(mksnapshot_flags)',
|
||
],
|
||
@@ -1842,6 +1845,7 @@
|
||
'action': [
|
||
'<(python)',
|
||
'<(V8_ROOT)/tools/run.py',
|
||
+ '<@(emulator)',
|
||
'<@(_inputs)',
|
||
'<@(_outputs)',
|
||
],
|
||
--
|
||
2.44.1
|
||
|