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

Commit b2a0025

Browse files
brianosmanSkia Commit-Bot
authored andcommitted
Fix PATH and EXE quoting for Windows ARM64 builds
The PATH change we make is the only thing that needs Windows style paths (and won't be fixed by GN). So, undo the other backslashes, and fix a minor error in the placement of the quote. Bug: skia:8569 Change-Id: I4feecaac96a4cf4d221a93e852a63f597e25e892 Reviewed-on: https://skia-review.googlesource.com/c/175825 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
1 parent 926a91b commit b2a0025

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

gn/toolchain/BUILD.gn

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ toolchain("msvc") {
3333

3434
if (msvc == 2015) {
3535
if (target_cpu == "x86") {
36-
bin = "$win_vc\\bin"
36+
bin = "$win_vc/bin"
3737
} else {
38-
bin = "$win_vc\\bin\\amd64"
38+
bin = "$win_vc/bin/amd64"
3939
}
4040
} else {
41-
bin = "$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\$target_cpu"
41+
bin = "$win_vc/Tools/MSVC/$win_toolchain_version/bin/HostX64/$target_cpu"
4242
}
4343

4444
env_setup = ""
@@ -48,7 +48,7 @@ toolchain("msvc") {
4848
env_setup = "cmd /c $win_sdk/bin/SetEnv.cmd /x86 && "
4949
} else if (target_cpu == "arm64") {
5050
# ARM64 compiler is incomplete - it relies on DLLs located in the host toolchain directory.
51-
env_setup = "cmd /C \"set PATH=%PATH%;$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\x64\" && "
51+
env_setup = "cmd /C set \"PATH=%PATH%;$win_vc\\Tools\\MSVC\\$win_toolchain_version\\bin\\HostX64\\x64\" && "
5252
}
5353

5454
cl_m32_flag = ""
@@ -65,9 +65,9 @@ toolchain("msvc") {
6565
lib = "\"$clang_win/bin/lld-link.exe\" /lib"
6666
link = "\"$clang_win/bin/lld-link.exe\""
6767
} else {
68-
cl = "$clang_win/bin/clang-cl"
69-
lib = "$clang_win/bin/lld-link /lib"
70-
link = "$clang_win/bin/lld-link"
68+
cl = "\"$clang_win/bin/clang-cl\""
69+
lib = "\"$clang_win/bin/lld-link\" /lib"
70+
link = "\"$clang_win/bin/lld-link\""
7171
}
7272
} else {
7373
cl = "\"$bin/cl.exe\""

0 commit comments

Comments
 (0)