Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index bf3e7785d935cf81520a2102d362b43463fc221f..76a7c06d57705e5bd4a4f12bbfe1594f41efaa4e 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -2134,8 +2134,27 @@ |
'enable_service_discovery%': 1 |
}], |
['clang_use_chrome_plugins==1 and OS!="win"', { |
- 'clang_chrome_plugins_flags': [ |
- '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' |
+ 'variables': { |
+ 'clang_chrome_plugins_flags': [ |
+ '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' |
+ ], |
+ }, |
+ 'conditions': [ |
+ # TODO(dcheng): https://crbug.com/417463 -- work to enable this flag |
+ # on all platforms is currently underway. |
+ ['OS=="linux" and chromeos==0', { |
+ 'clang_chrome_plugins_flags': [ |
cjhopman
2014/12/30 23:55:30
gyp list merging is done by appending and I believ
dcheng
2014/12/30 23:57:03
thakis@ mentioned this as well.
I took an old pat
dcheng
2014/12/31 01:33:54
Done.
|
+ '<@(clang_chrome_plugins_flags)', |
+ '-Xclang', |
+ '-plugin-arg-find-bad-constructs', |
+ '-Xclang', |
+ 'strict-virtual-specifiers', |
+ ], |
+ }, { |
+ 'clang_chrome_plugins_flags': [ |
+ '<@(clang_chrome_plugins_flags)', |
+ ], |
+ }], |
], |
}], |
['asan==1 or msan==1 or lsan==1 or tsan==1', { |