Skip to content
This repository was archived by the owner on Apr 21, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion build/config/win/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ config("common_linker_setup") {
# typically changes with each launch. This in turn means that breakpoints in
# Chrome.dll don't stick from one launch to the next. For this reason, we
# turn ASLR off in debug builds.
if (is_debug) {
# /DYNAMICBASE:NO isn't compatible with arm64.
if (is_debug && current_cpu != "arm64") {
ldflags += [ "/DYNAMICBASE:NO" ]
} else {
ldflags += [ "/DYNAMICBASE" ]
Expand Down
2 changes: 1 addition & 1 deletion build/toolchain/win/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ template("msvc_toolchain") {
} else if (toolchain_args.current_cpu == "arm64") {
is_msvc_assembler = false
prefix = rebase_path("$clang_base_path/bin", root_build_dir)
ml = "${goma_prefix}${prefix}/clang_cl.exe --target=arm64-windows"
ml = "${goma_prefix}${prefix}/clang-cl.exe --target=arm64-windows"
x64 = ""
} else {
ml = "ml.exe"
Expand Down