Chromium Code Reviews| Index: build/standalone.gypi |
| diff --git a/build/standalone.gypi b/build/standalone.gypi |
| index 5269b95f64dbd9cf2f6ecba7c9c0d8764a4bf550..8ec841da498cd70a2691760f96fe9f568ae1dfd5 100644 |
| --- a/build/standalone.gypi |
| +++ b/build/standalone.gypi |
| @@ -362,6 +362,23 @@ |
| 'host_cc': '<!(which gcc)', |
| 'host_cxx': '<!(which g++)', |
| }], |
| + ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', { |
|
Michael Achenbach
2016/02/23 15:51:01
Unfortunately gyp doesn't support clever chaining
|
| + 'conditions': [ |
| + ['coverage==1', { |
| + 'cc_wrapper': '<(base_dir)/build/coverage_wrapper.py <(gomadir)/gomacc', |
| + }, { |
| + 'cc_wrapper': '<(gomadir)/gomacc', |
| + }], |
| + ], |
| + }, { |
| + 'conditions': [ |
| + ['coverage==1', { |
| + 'cc_wrapper': '<(base_dir)/build/coverage_wrapper.py', |
| + }, { |
| + 'cc_wrapper': 0, |
| + }], |
| + ], |
| + }], |
| ], |
| # Default ARM variable settings. |
| 'arm_version%': 'default', |
| @@ -1261,12 +1278,12 @@ |
| # TODO(yyanagisawa): supports GENERATOR==make |
| # make generator doesn't support CC_wrapper without CC |
| # in make_global_settings yet. |
| - ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', { |
| + ['cc_wrapper!=0', { |
| 'make_global_settings': [ |
| - ['CC_wrapper', '<(gomadir)/gomacc'], |
| - ['CXX_wrapper', '<(gomadir)/gomacc'], |
| - ['CC.host_wrapper', '<(gomadir)/gomacc'], |
| - ['CXX.host_wrapper', '<(gomadir)/gomacc'], |
| + ['CC_wrapper', '<(cc_wrapper)'], |
| + ['CXX_wrapper', '<(cc_wrapper)'], |
| + ['CC.host_wrapper', '<(cc_wrapper)'], |
| + ['CXX.host_wrapper', '<(cc_wrapper)'], |
| ], |
| }], |
| ['use_lto==1', { |