Skip to content
This repository was archived by the owner on Apr 21, 2025. It is now read-only.

Buildroot side of change to narrow Windows Android arm hack #645

Merged
zanderso merged 1 commit into from
Nov 5, 2022
Merged

Buildroot side of change to narrow Windows Android arm hack #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion build/config/BUILDCONFIG.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,11 @@ if (custom_toolchain != "") {
} else if (host_os == "mac") {
host_toolchain = "//build/toolchain/mac:clang_$host_cpu"
} else if (host_os == "win") {
host_toolchain = "//build/toolchain/win:$current_cpu"
if (is_clang) {
host_toolchain = "//build/toolchain/win:clang_$host_cpu"
} else {
host_toolchain = "//build/toolchain/win:$host_cpu"
}
} else {
assert(false, "Unknown host for android cross compile")
}
Expand Down
9 changes: 8 additions & 1 deletion build/toolchain/win/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ if (current_toolchain == default_toolchain) {
"copy_dlls",
rebase_path(root_build_dir),
configuration,
target_cpu,
current_cpu,
])
}

Expand Down Expand Up @@ -284,6 +284,13 @@ if (target_cpu == "x64") {
}
}

if (target_cpu == "arm") {
# When the target cpu is "arm", we use the 32-bit intel toolchain "x86".
win_toolchains("x86") {
toolchain_arch = "x86"
}
}

if (target_cpu == "arm64") {
win_toolchains("arm64") {
toolchain_arch = "arm64"
Expand Down