summaryrefslogtreecommitdiffstats
path: root/testing
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 /testing
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 'testing')
-rw-r--r--testing/gtest.gyp14
1 files changed, 14 insertions, 0 deletions
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index e813b49..da95f42 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -79,6 +79,20 @@
],
},
}],
+ ['clang==1', {
+ # We want gtest features that use tr1::tuple, but clang currently
+ # doesn't support the variadic templates used by libstdc++'s
+ # implementation. gtest supports this scenario by providing its
+ # own implementation but we must opt in to it.
+ 'defines': [
+ 'GTEST_USE_OWN_TR1_TUPLE=1',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'GTEST_USE_OWN_TR1_TUPLE=1',
+ ],
+ },
+ }],
],
'direct_dependent_settings': {
'defines': [