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

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

Issue 1277243002: Copy only the DLLs for the default toolchain on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 4a903d69e1fd0cef17594d38ba59c407ef81a426..6c3e06b1b4a18455b841afeb508e9dd55ed76b5f 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -48,6 +48,23 @@ if (use_goma) {
# This value will be inherited in the toolchain below.
concurrent_links = exec_script("../get_concurrent_links.py", [], "value")
+# Copy the VS runtime DLL for the default toolchain the root build directory so
+# things will run.
+if (current_toolchain == default_toolchain) {
+ if (is_debug) {
+ configuration_name = "Debug"
+ } else {
+ configuration_name = "Release"
+ }
+ exec_script("../../vs_toolchain.py",
+ [
+ "copy_dlls",
+ rebase_path(root_build_dir),
+ configuration_name,
+ target_cpu,
+ ])
+}
+
# Parameters:
# current_cpu: current_cpu to pass as a build arg
# current_os: current_os to pass as a build arg
@@ -59,19 +76,6 @@ template("msvc_toolchain") {
env = invoker.environment
- if (is_debug) {
- configuration = "Debug"
- } else {
- configuration = "Release"
- }
- exec_script("../../vs_toolchain.py",
- [
- "copy_dlls",
- rebase_path(root_build_dir),
- configuration,
- invoker.current_cpu,
- ])
-
cl = invoker.cl
toolchain(target_name) {
« 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