mirror/naiveproxy
1
0
Fork 0
mirror of https://github.com/klzgrad/naiveproxy.git synced 2024-11-28 00:06:09 +03:00
Code Issues Projects Releases Wiki Activity

build: Allow setting cc_wrapper in Windows build

Browse Source
This commit is contained in:
klzgrad 2019-01-11 11:49:46 +00:00
parent 6419bdd84d
commit 003d105506
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/build/toolchain/win/BUILD.gn
View File

@ -6,6 +6,7 @@ import("//build/config/clang/clang.gni")
import("//build/config/compiler/compiler.gni") import("//build/config/compiler/compiler.gni")
import("//build/config/sanitizers/sanitizers.gni") import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/win/visual_studio_version.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/clang_static_analyzer.gni")
import("//build/toolchain/goma.gni") import("//build/toolchain/goma.gni")
import("//build/toolchain/toolchain.gni") import("//build/toolchain/toolchain.gni")
@ -28,8 +29,14 @@ if (use_goma) {
} else { } else {
goma_prefix = "$goma_dir/gomacc " goma_prefix = "$goma_dir/gomacc "
} }
clang_prefix = goma_prefix
} else { } else {
goma_prefix = "" 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 # 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) { msvc_toolchain("win_clang_" + win_build_host_cpu) {
environment = "environment." + win_build_host_cpu environment = "environment." + win_build_host_cpu
prefix = rebase_path("$clang_base_path/bin", root_build_dir) 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}" sys_include_flags = "${build_cpu_toolchain_data.include_flags_imsvc}"
if (host_os != "win") { if (host_os != "win") {
# For win cross build. # For win cross build.
@ -426,7 +433,7 @@ template("win_x64_toolchains") {
msvc_toolchain("win_clang_" + target_name) { msvc_toolchain("win_clang_" + target_name) {
environment = "environment.x64" environment = "environment.x64"
prefix = rebase_path("$clang_base_path/bin", root_build_dir) 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}" sys_include_flags = "${x64_toolchain_data.include_flags_imsvc}"
if (host_os != "win") { if (host_os != "win") {
# For win cross build # For win cross build