summaryrefslogtreecommitdiffstats
path: root/sandbox/sandbox.gyp
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 18:25:37 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 18:25:37 +0000
commitc21e0e82db0a3e9a60940f7ceea74edb5a1c4122 (patch)
tree1bf0d8d3ab7e2adab9893158a8be1f8638698e62 /sandbox/sandbox.gyp
parenta3cd502bb5891548171a4bb17fe1ce351cd45ba7 (diff)
downloadchromium_src-c21e0e82db0a3e9a60940f7ceea74edb5a1c4122.zip
chromium_src-c21e0e82db0a3e9a60940f7ceea74edb5a1c4122.tar.gz
chromium_src-c21e0e82db0a3e9a60940f7ceea74edb5a1c4122.tar.bz2
patch
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox/sandbox.gyp')
-rw-r--r--sandbox/sandbox.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index 706cba2..ab89665 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -135,7 +135,7 @@
},
],
}],
- [ 'OS=="linux" and selinux==0', {
+ [ 'OS=="linux" and selinux==0 and clang==0', {
'targets': [
{
'target_name': 'chrome_sandbox',
@@ -168,7 +168,7 @@
},
],
}],
- [ 'OS=="linux" and selinux==1', {
+ [ 'OS=="linux" and (selinux==1 or clang==1)', {
# GYP requires that each file have at least one target defined.
'targets': [
{