Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Unified Diff: build/toolchain/win/BUILD.gn

Issue 1585113007: win: Call clang-cl instead of clang-cl.exe when targeting win on a non-win host. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/win/BUILD.gn
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
index 02333532a46932a16dc5b6d8153e673e636ce8d7..4fb72797d5f279cccb8b68c257a25fccd33725e0 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -235,6 +235,12 @@ template("msvc_toolchain") {
}
}
+if (host_os == "win") {
+ clang_cl = "clang-cl.exe"
+} else {
+ clang_cl = "clang-cl"
+}
+
# 32-bit toolchains. Only define these when the target architecture is 32-bit
# since we don't do any 32-bit cross compiles when targeting 64-bit (the
# build does generate some 64-bit stuff from 32-bit target builds).
@@ -261,7 +267,7 @@ if (target_cpu == "x86") {
toolchain_cpu = "x86"
prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
root_build_dir)
- cl = "${goma_prefix}$prefix/clang-cl.exe"
+ cl = "${goma_prefix}$prefix/${clang_cl}"
toolchain_os = "win"
is_clang = true
}
@@ -290,7 +296,7 @@ msvc_toolchain("clang_x64") {
toolchain_cpu = "x64"
prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
root_build_dir)
- cl = "${goma_prefix}$prefix/clang-cl.exe"
+ cl = "${goma_prefix}$prefix/${clang_cl}"
toolchain_os = "win"
is_clang = true
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698