From 003d105506a43c3013612573b1de4f2f964e4367 Mon Sep 17 00:00:00 2001 From: klzgrad Date: Fri, 11 Jan 2019 11:49:46 +0000 Subject: [PATCH] build: Allow setting cc_wrapper in Windows build --- src/build/toolchain/win/BUILD.gn | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/build/toolchain/win/BUILD.gn b/src/build/toolchain/win/BUILD.gn index 3c6c9d05d2..da3eb53291 100644 --- a/src/build/toolchain/win/BUILD.gn +++ b/src/build/toolchain/win/BUILD.gn @@ -6,6 +6,7 @@ import("//build/config/clang/clang.gni") import("//build/config/compiler/compiler.gni") import("//build/config/sanitizers/sanitizers.gni") import("//build/config/win/visual_studio_version.gni") +import("//build/toolchain/cc_wrapper.gni") import("//build/toolchain/clang_static_analyzer.gni") import("//build/toolchain/goma.gni") import("//build/toolchain/toolchain.gni") @@ -28,8 +29,14 @@ if (use_goma) { } else { goma_prefix = "$goma_dir/gomacc " } + clang_prefix = goma_prefix } else { goma_prefix = "" + if (cc_wrapper != "") { + clang_prefix = cc_wrapper + " " + } else { + clang_prefix = "" + } } # Copy the VS runtime DLL for the default toolchain to the root build directory @@ -377,7 +384,7 @@ if (win_build_host_cpu != "x64") { msvc_toolchain("win_clang_" + win_build_host_cpu) { environment = "environment." + win_build_host_cpu prefix = rebase_path("$clang_base_path/bin", root_build_dir) - cl = "${goma_prefix}$prefix/${clang_cl}" + cl = "${clang_prefix}$prefix/${clang_cl}" sys_include_flags = "${build_cpu_toolchain_data.include_flags_imsvc}" if (host_os != "win") { # For win cross build. @@ -426,7 +433,7 @@ template("win_x64_toolchains") { msvc_toolchain("win_clang_" + target_name) { environment = "environment.x64" prefix = rebase_path("$clang_base_path/bin", root_build_dir) - cl = "${goma_prefix}$prefix/${clang_cl}" + cl = "${clang_prefix}$prefix/${clang_cl}" sys_include_flags = "${x64_toolchain_data.include_flags_imsvc}" if (host_os != "win") { # For win cross build