Commit 4d8834f
build: add rust target for macOS cross compiles
When we build the macOS pkg, we build Node.js twice (on arm64):
- Once for arm64 (native)
- Once for x64, using a combination of Rosetta 2 and compiler flags
before combining both into a universal binary.
For the x64 case, pass target flag to `rustc` so that the binary is
built for the correct target architecture.
Signed-off-by: Richard Lau <richard.lau@ibm.com>
PR-URL: #63015
Reviewed-By: Stewart X Addison <sxa@redhat.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>1 parent dae2219 commit 4d8834f
2 files changed
Lines changed: 13 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1812,6 +1812,10 @@ def configure_node(o): | |||
| 1812 | 1812 | if flavor == 'win': | |
| 1813 | 1813 | o['variables']['cargo_rust_target'] = \ | |
| 1814 | 1814 | 'aarch64-pc-windows-msvc' if target_arch == 'arm64' else 'x86_64-pc-windows-msvc' | |
| 1815 | + # Always set the Rust target for x64 macOS in case we will be building | ||
| 1816 | + # under Rosetta 2. | ||
| 1817 | + if flavor == 'mac' and target_arch == 'x64': | ||
| 1818 | + o['variables']['cargo_rust_target'] = 'x86_64-apple-darwin' | ||
| 1815 | 1819 | ||
| 1816 | 1820 | # Allow overriding the compiler - needed by embedders. | |
| 1817 | 1821 | if options.use_clang: | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -11,12 +11,17 @@ | |||
| 11 | 11 | }, | |
| 12 | 12 | 'conditions': [ | |
| 13 | 13 | ['cargo_rust_target!=""', { | |
| 14 | + 'variables': { | ||
| 15 | + 'cargo_build_flags': ['--target', '<(cargo_rust_target)'], | ||
| 16 | + } | ||
| 17 | + }], | ||
| 18 | + ['OS=="win"', { | ||
| 14 | 19 | 'variables': { | |
| 15 | 20 | 'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/$(Platform)/release/node_crates.lib', | |
| 16 | 21 | }, | |
| 17 | 22 | }, { | |
| 18 | 23 | 'variables': { | |
| 19 | - 'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/release/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)', | ||
| 24 | + 'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/<(cargo_rust_target)/release/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)', | ||
| 20 | 25 | }, | |
| 21 | 26 | }], | |
| 22 | 27 | ], | |
@@ -25,13 +30,13 @@ | |||
| 25 | 30 | 'cargo_build_flags': [], | |
| 26 | 31 | }, | |
| 27 | 32 | 'conditions': [ | |
| 28 | - ['cargo_rust_target!=""', { | ||
| 33 | + ['OS=="win"', { | ||
| 29 | 34 | 'variables': { | |
| 30 | 35 | 'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/$(Platform)/debug/node_crates.lib', | |
| 31 | 36 | }, | |
| 32 | 37 | }, { | |
| 33 | 38 | 'variables': { | |
| 34 | - 'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/debug/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)', | ||
| 39 | + 'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/<(cargo_rust_target)/debug/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)', | ||
| 35 | 40 | }, | |
| 36 | 41 | }], | |
| 37 | 42 | ], | |
@@ -62,7 +67,7 @@ | |||
| 62 | 67 | ], | |
| 63 | 68 | }, | |
| 64 | 69 | 'conditions': [ | |
| 65 | - ['cargo_rust_target!=""', { | ||
| 70 | + ['OS=="win"', { | ||
| 66 | 71 | 'actions': [ | |
| 67 | 72 | { | |
| 68 | 73 | 'action_name': 'cargo_build', | |
0 commit comments