mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-30 08:44:31 +00:00
0a05fbb9a0
This commit successfully cross-compiles chromium from buildPlatform=x86_64-linux to hostPlatform=aarch64-linux. Other PRs in this project (can be reviewed/merged independently of this one): - https://github.com/NixOS/nixpkgs/pull/227707 - https://github.com/NixOS/nixpkgs/pull/227708 - https://github.com/NixOS/nixpkgs/pull/227710 - https://github.com/NixOS/nixpkgs/pull/227719 - https://github.com/NixOS/nixpkgs/pull/227720 - https://github.com/NixOS/nixpkgs/pull/227722 - https://github.com/NixOS/nixpkgs/pull/227723
32 lines
898 B
Diff
32 lines
898 B
Diff
diff --git a/build/toolchain/linux/unbundle/BUILD.gn b/build/toolchain/linux/unbundle/BUILD.gn
|
|
index a091491236bb1..d36fd4e652fbf 100644
|
|
--- a/build/toolchain/linux/unbundle/BUILD.gn
|
|
+++ b/build/toolchain/linux/unbundle/BUILD.gn
|
|
@@ -9,6 +9,7 @@ gcc_toolchain("default") {
|
|
cxx = getenv("CXX")
|
|
ar = getenv("AR")
|
|
nm = getenv("NM")
|
|
+ readelf = getenv("READELF")
|
|
ld = cxx
|
|
|
|
extra_cflags = getenv("CFLAGS")
|
|
@@ -27,6 +28,7 @@ gcc_toolchain("host") {
|
|
cxx = getenv("BUILD_CXX")
|
|
ar = getenv("BUILD_AR")
|
|
nm = getenv("BUILD_NM")
|
|
+ readelf = getenv("BUILD_READELF")
|
|
ld = cxx
|
|
|
|
extra_cflags = getenv("BUILD_CFLAGS")
|
|
@@ -35,7 +37,8 @@ gcc_toolchain("host") {
|
|
extra_ldflags = getenv("BUILD_LDFLAGS")
|
|
|
|
toolchain_args = {
|
|
- current_cpu = current_cpu
|
|
- current_os = current_os
|
|
+ current_cpu = host_cpu
|
|
+ current_os = host_os
|
|
+ v8_current_cpu = target_cpu
|
|
}
|
|
}
|