| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/clang/clang.gni") |
| 5 import("//build/config/sanitizers/sanitizers.gni") | 6 import("//build/config/sanitizers/sanitizers.gni") |
| 6 import("//build/config/win/visual_studio_version.gni") | 7 import("//build/config/win/visual_studio_version.gni") |
| 7 import("//build/toolchain/goma.gni") | 8 import("//build/toolchain/goma.gni") |
| 8 import("//build/toolchain/toolchain.gni") | 9 import("//build/toolchain/toolchain.gni") |
| 9 import("//build/toolchain/concurrent_links.gni") | 10 import("//build/toolchain/concurrent_links.gni") |
| 10 | 11 |
| 11 # Should only be running on Windows. | 12 # Should only be running on Windows. |
| 12 assert(is_win) | 13 assert(is_win) |
| 13 | 14 |
| 14 # Setup the Visual Studio state. | 15 # Setup the Visual Studio state. |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 } else { | 64 } else { |
| 64 cl = invoker.cl | 65 cl = invoker.cl |
| 65 } | 66 } |
| 66 | 67 |
| 67 if (use_lld) { | 68 if (use_lld) { |
| 68 if (host_os == "win") { | 69 if (host_os == "win") { |
| 69 lld_link = "lld-link.exe" | 70 lld_link = "lld-link.exe" |
| 70 } else { | 71 } else { |
| 71 lld_link = "lld-link" | 72 lld_link = "lld-link" |
| 72 } | 73 } |
| 73 prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin", | 74 prefix = rebase_path("$clang_base_path/bin", root_build_dir) |
| 74 root_build_dir) | |
| 75 | 75 |
| 76 # lld-link includes a replacement for lib.exe that can produce thin | 76 # lld-link includes a replacement for lib.exe that can produce thin |
| 77 # archives and understands bitcode (for lto builds). | 77 # archives and understands bitcode (for lto builds). |
| 78 lib = "$prefix/$lld_link /lib /llvmlibthin" | 78 lib = "$prefix/$lld_link /lib /llvmlibthin" |
| 79 link = "$prefix/$lld_link" | 79 link = "$prefix/$lld_link" |
| 80 } else { | 80 } else { |
| 81 lib = "lib.exe" | 81 lib = "lib.exe" |
| 82 link = "link.exe" | 82 link = "link.exe" |
| 83 } | 83 } |
| 84 | 84 |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 msvc_toolchain("x86") { | 306 msvc_toolchain("x86") { |
| 307 environment = "environment.x86" | 307 environment = "environment.x86" |
| 308 toolchain_cpu = "x86" | 308 toolchain_cpu = "x86" |
| 309 cl = "${goma_prefix}\"${x86_toolchain_data.vc_bin_dir}/cl.exe\"" | 309 cl = "${goma_prefix}\"${x86_toolchain_data.vc_bin_dir}/cl.exe\"" |
| 310 is_clang = false | 310 is_clang = false |
| 311 } | 311 } |
| 312 | 312 |
| 313 msvc_toolchain("clang_x86") { | 313 msvc_toolchain("clang_x86") { |
| 314 environment = "environment.x86" | 314 environment = "environment.x86" |
| 315 toolchain_cpu = "x86" | 315 toolchain_cpu = "x86" |
| 316 prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin", | 316 prefix = rebase_path("$clang_base_path/bin", root_build_dir) |
| 317 root_build_dir) | |
| 318 cl = "${goma_prefix}$prefix/${clang_cl}" | 317 cl = "${goma_prefix}$prefix/${clang_cl}" |
| 319 toolchain_os = "win" | 318 toolchain_os = "win" |
| 320 is_clang = true | 319 is_clang = true |
| 321 sys_include_flags = "${x86_toolchain_data.include_flags}" | 320 sys_include_flags = "${x86_toolchain_data.include_flags}" |
| 322 } | 321 } |
| 323 } | 322 } |
| 324 | 323 |
| 325 # 64-bit toolchains. | 324 # 64-bit toolchains. |
| 326 x64_toolchain_data = exec_script("setup_toolchain.py", | 325 x64_toolchain_data = exec_script("setup_toolchain.py", |
| 327 [ | 326 [ |
| (...skipping 23 matching lines...) Expand all Loading... |
| 351 # This shares a name with a global and forward_variables_from won't clobber | 350 # This shares a name with a global and forward_variables_from won't clobber |
| 352 # the existing value, so we need to set it explicitly. | 351 # the existing value, so we need to set it explicitly. |
| 353 if (defined(invoker.is_component_build)) { | 352 if (defined(invoker.is_component_build)) { |
| 354 is_component_build = invoker.is_component_build | 353 is_component_build = invoker.is_component_build |
| 355 } | 354 } |
| 356 } | 355 } |
| 357 | 356 |
| 358 msvc_toolchain("clang_" + target_name) { | 357 msvc_toolchain("clang_" + target_name) { |
| 359 environment = "environment.x64" | 358 environment = "environment.x64" |
| 360 toolchain_cpu = "x64" | 359 toolchain_cpu = "x64" |
| 361 prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin", | 360 prefix = rebase_path("$clang_base_path/bin", root_build_dir) |
| 362 root_build_dir) | |
| 363 cl = "${goma_prefix}$prefix/${clang_cl}" | 361 cl = "${goma_prefix}$prefix/${clang_cl}" |
| 364 toolchain_os = "win" | 362 toolchain_os = "win" |
| 365 is_clang = true | 363 is_clang = true |
| 366 sys_include_flags = "${x64_toolchain_data.include_flags}" | 364 sys_include_flags = "${x64_toolchain_data.include_flags}" |
| 367 | 365 |
| 368 # This shares a name with a global and forward_variables_from won't clobber | 366 # This shares a name with a global and forward_variables_from won't clobber |
| 369 # the existing value, so we need to set it explicitly. | 367 # the existing value, so we need to set it explicitly. |
| 370 if (defined(invoker.is_component_build)) { | 368 if (defined(invoker.is_component_build)) { |
| 371 is_component_build = invoker.is_component_build | 369 is_component_build = invoker.is_component_build |
| 372 } | 370 } |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 | 413 |
| 416 msvc_toolchain("winrt_x64") { | 414 msvc_toolchain("winrt_x64") { |
| 417 environment = "environment.winrt_x64" | 415 environment = "environment.winrt_x64" |
| 418 cl = "${goma_prefix}\"${vc_bin_dir}/cl.exe\"" | 416 cl = "${goma_prefix}\"${vc_bin_dir}/cl.exe\"" |
| 419 is_clang = false | 417 is_clang = false |
| 420 | 418 |
| 421 toolchain_cpu = "x64" | 419 toolchain_cpu = "x64" |
| 422 toolchain_os = current_os | 420 toolchain_os = current_os |
| 423 } | 421 } |
| 424 } | 422 } |
| OLD | NEW |