| OLD | NEW |
| 1 { | 1 { |
| 2 # TODO(binji): pnacl fails with error: | 2 # TODO(binji): pnacl fails with error: |
| 3 # In file included from gtest.cc:133: | 3 # In file included from gtest.cc:133: |
| 4 # pepper_23/include/gtest/internal/src/gtest-internal-inl.h:213:8: | 4 # pepper_23/include/gtest/internal/src/gtest-internal-inl.h:213:8: |
| 5 # error: private field 'pretty_' is not used [-Werror,-Wunused-private-field
] | 5 # error: private field 'pretty_' is not used [-Werror,-Wunused-private-field
] |
| 6 # | 6 # |
| 7 # We can fix this by passing -Wno-unused-private-field to clang, but gcc | 7 # We can fix this by passing -Wno-unused-private-field to clang, but gcc |
| 8 # doesn't support this flag so we'll have to support splitting CXXFLAGS based | 8 # doesn't support this flag so we'll have to support splitting CXXFLAGS based |
| 9 # on TOOL first. | 9 # on TOOL first. |
| 10 'TOOLS': ['newlib', 'glibc', 'win', 'linux'], | 10 'TOOLS': ['newlib:x86', 'newlib:x64', 'glibc', 'win', 'linux'], |
| 11 'SEARCH': [ | 11 'SEARCH': [ |
| 12 '.', | 12 '.', |
| 13 '../../../../testing/gtest/include/gtest', | 13 '../../../../testing/gtest/include/gtest', |
| 14 '../../../../testing/gtest/include/gtest/internal', | 14 '../../../../testing/gtest/include/gtest/internal', |
| 15 '../../../../testing/gtest/src', | 15 '../../../../testing/gtest/src', |
| 16 ], | 16 ], |
| 17 'TARGETS': [ | 17 'TARGETS': [ |
| 18 { | 18 { |
| 19 'NAME' : 'gtest', | 19 'NAME' : 'gtest', |
| 20 'TYPE' : 'lib', | 20 'TYPE' : 'lib', |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 # spot. | 78 # spot. |
| 79 'FILES': [ | 79 'FILES': [ |
| 80 'gtest-internal-inl.h', | 80 'gtest-internal-inl.h', |
| 81 ], | 81 ], |
| 82 'DEST': 'include/gtest/internal/src', | 82 'DEST': 'include/gtest/internal/src', |
| 83 }, | 83 }, |
| 84 ], | 84 ], |
| 85 'DEST': 'testlibs', | 85 'DEST': 'testlibs', |
| 86 'NAME': 'gtest', | 86 'NAME': 'gtest', |
| 87 } | 87 } |
| OLD | NEW |