Chromium Code Reviews| Index: build/toolchain/cros/BUILD.gn |
| diff --git a/build/toolchain/cros/BUILD.gn b/build/toolchain/cros/BUILD.gn |
| index bf139dc12da8192f02bd1e7c83e18c3a77f795a5..6e6de7645c63677c6761daf942bb7c87412ca264 100644 |
| --- a/build/toolchain/cros/BUILD.gn |
| +++ b/build/toolchain/cros/BUILD.gn |
| @@ -9,9 +9,14 @@ import("//build/toolchain/cros_toolchain.gni") |
| # This is the normal toolchain for most targets. |
| gcc_toolchain("target") { |
| + if (cc_wrapper != "") { |
| + compiler_prefix = cc_wrapper + " " |
| + } else { |
| + compiler_prefix = "" |
| + } |
| ar = cros_target_ar |
| - cc = cros_target_cc |
| - cxx = cros_target_cxx |
| + cc = compiler_prefix + cros_target_cc |
| + cxx = compiler_prefix + cros_target_cxx |
|
dshwang
2016/09/06 15:00:12
exclude target build, because for some reason, ice
|
| ld = cxx |
| if (cros_target_ld != "") { |
| ld = cros_target_ld |
| @@ -73,10 +78,16 @@ gcc_toolchain("nacl_bootstrap") { |
| } |
| gcc_toolchain("host") { |
| + if (cc_wrapper != "") { |
| + compiler_prefix = cc_wrapper + " " |
| + } else { |
| + compiler_prefix = "" |
| + } |
| + |
| # These are args for the template. |
| ar = cros_host_ar |
| - cc = cros_host_cc |
| - cxx = cros_host_cxx |
| + cc = compiler_prefix + cros_host_cc |
| + cxx = compiler_prefix + cros_host_cxx |
| ld = cxx |
| if (cros_host_ld != "") { |
| ld = cros_host_ld |