diff options
| author | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-22 02:32:06 +0000 |
|---|---|---|
| committer | sbc@chromium.org <sbc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-22 02:32:06 +0000 |
| commit | 6d18e99c2811bee07998169e4df60054f8b72071 (patch) | |
| tree | 1974a33a330d18cac9d4cdd7375343be097268eb /native_client_sdk/src/libraries/gtest/library.dsc | |
| parent | 55e2437c2b18cf0135ac4194e2fa7b41fddcc470 (diff) | |
| download | chromium_src-6d18e99c2811bee07998169e4df60054f8b72071.zip chromium_src-6d18e99c2811bee07998169e4df60054f8b72071.tar.gz chromium_src-6d18e99c2811bee07998169e4df60054f8b72071.tar.bz2 | |
Fix toplevel example Makefile to build all configurations
when using using --gyp to generate Makefiles.
Also, fix javascript and html files so the work with
or without --gyp.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10964025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src/libraries/gtest/library.dsc')
| -rw-r--r-- | native_client_sdk/src/libraries/gtest/library.dsc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/native_client_sdk/src/libraries/gtest/library.dsc b/native_client_sdk/src/libraries/gtest/library.dsc index 0f1eec1..d89883c 100644 --- a/native_client_sdk/src/libraries/gtest/library.dsc +++ b/native_client_sdk/src/libraries/gtest/library.dsc @@ -29,9 +29,10 @@ 'gtest-typed-test.cc', 'nacl_gtest_dummy_sys.cc', ], - # Ignore warning: + # Ignore warnings: # gtest.cc:2555: error: enumeration value ‘COLOR_DEFAULT’ not handled in switch - 'CXXFLAGS': ['-Wno-switch-enum'], + # gtest-typed-test.h:239:47: error: anonymous variadic macros were introduced in C99 [-Werror=variadic-macros] + 'CXXFLAGS': ['-Wno-switch-enum', '-Wno-variadic-macros'], 'INCLUDES': [ # See comment below about gtest-internal-inl.h '$(NACL_SDK_ROOT)/include/gtest/internal', |