summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-18 00:09:15 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-18 00:09:15 +0000
commit58680cec807bec4cbca35cfad74439a7653040c4 (patch)
tree1b22d316f591fce655f7e91dc43462534d9af577 /sandbox
parent784ea1ab3797a0aade739c3d80f9f12b41160aef (diff)
downloadchromium_src-58680cec807bec4cbca35cfad74439a7653040c4.zip
chromium_src-58680cec807bec4cbca35cfad74439a7653040c4.tar.gz
chromium_src-58680cec807bec4cbca35cfad74439a7653040c4.tar.bz2
Support for building Chrome using Clang.
To build, set the clang=1 gyp_define. This patch is the culmination of many months of effort and many patches. It contains the minimal changes to Chrome that are Clang-specific. With this, I can build the "chrome" target. Once this patch is in, we can incrementally fix bits of Chrome and various tests and remove the Clang-specific workarounds. Review URL: http://codereview.chromium.org/522020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59882 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 1150261..692e526 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': [
{