| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 14839d30eed22551a0e90c9565ab56e07b8c5714..60d9dcced0f71f46ea5e753b6fc2fa90525200d8 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -1533,21 +1533,15 @@
|
| ],
|
| }],
|
| ['clang==1 and clang_use_chrome_plugins==1', {
|
| - 'target_conditions': [
|
| - ['_toolset=="target"', {
|
| - 'cflags': [
|
| - '<(clang_chrome_plugins_flags)',
|
| - ],
|
| - }]],
|
| + 'cflags': [
|
| + '<(clang_chrome_plugins_flags)',
|
| + ],
|
| }],
|
| ['clang==1 and clang_load!="" and clang_add_plugin!=""', {
|
| - 'target_conditions': [
|
| - ['_toolset=="target"', {
|
| - 'cflags': [
|
| - '-Xclang', '-load', '-Xclang', '<(clang_load)',
|
| - '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)',
|
| - ],
|
| - }]],
|
| + 'cflags': [
|
| + '-Xclang', '-load', '-Xclang', '<(clang_load)',
|
| + '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)',
|
| + ],
|
| }],
|
| ['no_strict_aliasing==1', {
|
| 'cflags': [
|
|
|