From 89d17bca548b566cf2b37009e339b5e7ff2bc105 Mon Sep 17 00:00:00 2001 From: "bmeurer@chromium.org" Date: Thu, 7 Aug 2014 04:44:55 +0000 Subject: [PATCH] Apply patch from https://codereview.chromium.org/425333002 to gtest.gyp. This may be required for https://codereview.chromium.org/425333002 to land in Chromium. TBR=machenbach@chromium.org Review URL: https://codereview.chromium.org/448053002 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22951 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- testing/gtest.gyp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testing/gtest.gyp b/testing/gtest.gyp index 695439a..1fda42c 100644 --- a/testing/gtest.gyp +++ b/testing/gtest.gyp @@ -52,10 +52,13 @@ # In order to allow regex matches in gtest to be shared between Windows # and other systems, we tell gtest to always use it's internal engine. 'GTEST_HAS_POSIX_RE=0', + # Chrome doesn't support / require C++11, yet. + 'GTEST_LANG_CXX11=0', ], 'all_dependent_settings': { 'defines': [ 'GTEST_HAS_POSIX_RE=0', + 'GTEST_LANG_CXX11=0', ], }, 'conditions': [ -- 2.7.4