Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index cede6f187720f60150cd632e9a4458f1258b3014..e1081dcdad5a1253048873fb51944b2195aa70b3 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -2020,11 +2020,17 @@ |
| }], |
| ['linux_use_gold_binary==1', { |
| 'variables': { |
| - # We pass the path to gold to the compiler. gyp leaves |
| - # unspecified what the cwd is when running the compiler, |
| - # so the normal gyp path-munging fails us. This hack |
| - # gets the right path. |
| - 'gold_path': '<(PRODUCT_DIR)/../../third_party/gold', |
| + 'conditions': [ |
| + ['inside_chromium_build==1', { |
| + # We pass the path to gold to the compiler. gyp leaves |
| + # unspecified what the cwd is when running the compiler, |
| + # so the normal gyp path-munging fails us. This hack |
| + # gets the right path. |
| + 'gold_path': '<(PRODUCT_DIR)/../../third_party/gold', |
| + }, { |
| + 'gold_path': '<(PRODUCT_DIR)/../../Source/WebKit/chromium/third_party/gold', |
|
Nico
2012/02/27 21:27:38
I thought webkit/chromium standalone isn't really
|
| + }] |
| + ] |
| }, |
| 'ldflags': [ |
| # Put our gold binary in the search path for the linker. |