summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-11 00:16:26 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-11 00:16:26 +0000
commitd237206836dfe3fcf11556c4466495d8015356b4 (patch)
tree11894e6483e70113e4c289faed17896ae48ee4ec /build
parent13e4f869b48098bb6ca520df4c4b0481fc7b1507 (diff)
downloadchromium_src-d237206836dfe3fcf11556c4466495d8015356b4.zip
chromium_src-d237206836dfe3fcf11556c4466495d8015356b4.tar.gz
chromium_src-d237206836dfe3fcf11556c4466495d8015356b4.tar.bz2
Don't make clang plugins stuff dependent on _toolset=target either.
Follow-up to http://codereview.chromium.org/7606012 BUG=none TEST=nothing changes Review URL: http://codereview.chromium.org/7611005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi20
1 files changed, 7 insertions, 13 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 14839d3..60d9dcc 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': [