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

Commit 53abad0

Browse files
authored
Buildroot fixes for the Windows arm64 build (#577)
1 parent cad5e81 commit 53abad0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

build/config/win/BUILD.gn

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ config("common_linker_setup") {
9393
# typically changes with each launch. This in turn means that breakpoints in
9494
# Chrome.dll don't stick from one launch to the next. For this reason, we
9595
# turn ASLR off in debug builds.
96-
if (is_debug) {
96+
# /DYNAMICBASE:NO isn't compatible with arm64.
97+
if (is_debug && current_cpu != "arm64") {
9798
ldflags += [ "/DYNAMICBASE:NO" ]
9899
} else {
99100
ldflags += [ "/DYNAMICBASE" ]

build/toolchain/win/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ template("msvc_toolchain") {
141141
} else if (toolchain_args.current_cpu == "arm64") {
142142
is_msvc_assembler = false
143143
prefix = rebase_path("$clang_base_path/bin", root_build_dir)
144-
ml = "${goma_prefix}${prefix}/clang_cl.exe --target=arm64-windows"
144+
ml = "${goma_prefix}${prefix}/clang-cl.exe --target=arm64-windows"
145145
x64 = ""
146146
} else {
147147
ml = "ml.exe"

0 commit comments

Comments
 (0)