Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(890)

Unified Diff: testing/gtest_nacl.gyp

Issue 2174663002: Remove GTEST_LANG_CXX11 and switch to C++11 on gtest and gmock (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/gtest.gyp ('k') | ui/events/events_unittests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/gtest_nacl.gyp
diff --git a/testing/gtest_nacl.gyp b/testing/gtest_nacl.gyp
index d1c0ce0fb40387f8138f57e1e4ce0dad3a1fbeb0..910c9e37890dfb8b221bfd36a8c211cb04c5448e 100644
--- a/testing/gtest_nacl.gyp
+++ b/testing/gtest_nacl.gyp
@@ -36,20 +36,10 @@
# Windows and other systems, we tell gtest to always use it's
# internal engine.
'GTEST_HAS_POSIX_RE=0',
- 'GTEST_LANG_CXX11=0',
- # gtest isn't able to figure out when RTTI is disabled for gcc
- # versions older than 4.3.2, and assumes it's enabled. Our Mac
- # and Linux builds disable RTTI, and cannot guarantee that the
- # compiler will be 4.3.2. or newer. The Mac, for example, uses
- # 4.2.1 as that is the latest available on that platform. gtest
- # must be instructed that RTTI is disabled here, and for any
- # direct dependents that might include gtest headers.
- 'GTEST_HAS_RTTI=0',
],
'all_dependent_settings': {
'defines': [
'GTEST_HAS_POSIX_RE=0',
- 'GTEST_LANG_CXX11=0',
],
'link_flags': [
'-lgtest_nacl',
@@ -58,7 +48,6 @@
'direct_dependent_settings': {
'defines': [
'UNIT_TEST',
- 'GTEST_HAS_RTTI=0',
],
'include_dirs': [
'gtest/include', # So that gtest headers can find themselves.
« no previous file with comments | « testing/gtest.gyp ('k') | ui/events/events_unittests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698