summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorglotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-27 11:13:04 +0000
committerglotov@google.com <glotov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-27 11:13:04 +0000
commitaf9f5639164ad5ed4de474c46099d58d699c082c (patch)
tree777618a39270d875d3a5edd5876f54e9421db841 /sandbox
parent0ab592b970360c9850b021e746624fa5160249b4 (diff)
downloadchromium_src-af9f5639164ad5ed4de474c46099d58d699c082c.zip
chromium_src-af9f5639164ad5ed4de474c46099d58d699c082c.tar.gz
chromium_src-af9f5639164ad5ed4de474c46099d58d699c082c.tar.bz2
Re-enabling chrome-sandbox for Clang builds.
As Clang now (since #13349 -- hans) supports asm .common directive, we may re-enable chrome-sandbox for Clang builds. BUG=chromium-os:16717, chromium:70871, chromium-os:88578 TEST=none Review URL: http://codereview.chromium.org/7233011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94271 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/sandbox.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sandbox/sandbox.gyp b/sandbox/sandbox.gyp
index 6832c8a..2166675 100644
--- a/sandbox/sandbox.gyp
+++ b/sandbox/sandbox.gyp
@@ -141,7 +141,7 @@
},
],
}],
- [ 'OS=="linux" and selinux==0 and clang==0', {
+ [ 'OS=="linux" and selinux==0', {
'targets': [
{
'target_name': 'chrome_sandbox',
@@ -174,7 +174,7 @@
},
],
}],
- [ 'OS=="linux" and (selinux==1 or clang==1)', {
+ [ 'OS=="linux" and selinux==1', {
# GYP requires that each file have at least one target defined.
'targets': [
{