summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-22 01:16:48 +0000
committerbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-22 01:16:48 +0000
commit55b36afe200a6ce09ff1607b7860d6cd4ab7265e (patch)
treed7e11b60909089cd1b691b185a21ae3711f9bf59 /native_client_sdk
parent1c7d43047be48bf182e8293292dee34d792138f3 (diff)
downloadchromium_src-55b36afe200a6ce09ff1607b7860d6cd4ab7265e.zip
chromium_src-55b36afe200a6ce09ff1607b7860d6cd4ab7265e.tar.gz
chromium_src-55b36afe200a6ce09ff1607b7860d6cd4ab7265e.tar.bz2
[NaCl SDK] Building gtest is no longer experimental.
BUG=none NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10828334 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152710 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
-rw-r--r--native_client_sdk/src/libraries/gtest/library.dsc11
1 files changed, 9 insertions, 2 deletions
diff --git a/native_client_sdk/src/libraries/gtest/library.dsc b/native_client_sdk/src/libraries/gtest/library.dsc
index ee5e87c..0f1eec1 100644
--- a/native_client_sdk/src/libraries/gtest/library.dsc
+++ b/native_client_sdk/src/libraries/gtest/library.dsc
@@ -1,5 +1,13 @@
{
- 'TOOLS': ['newlib', 'glibc', 'pnacl', 'win'],
+ # TODO(binji): pnacl fails with error:
+ # In file included from gtest.cc:133:
+ # pepper_23/include/gtest/internal/src/gtest-internal-inl.h:213:8:
+ # error: private field 'pretty_' is not used [-Werror,-Wunused-private-field]
+ #
+ # We can fix this by passing -Wno-unused-private-field to clang, but gcc
+ # doesn't support this flag so we'll have to support splitting CXXFLAGS based
+ # on TOOL first.
+ 'TOOLS': ['newlib', 'glibc', 'win', 'linux'],
'SEARCH': [
'.',
'../../../../testing/gtest/include/gtest',
@@ -75,5 +83,4 @@
],
'DEST': 'testing',
'NAME': 'gtest',
- 'EXPERIMENTAL': True,
}