diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-05 00:27:00 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-05 00:27:00 +0000 |
| commit | cf4f689f6917abc305c0960619d683b0bc00cce3 (patch) | |
| tree | a724a07ecff1e14bfdf513caa05cd3d1a21e0a28 /third_party/snappy/snappy.gyp | |
| parent | 296a8afe295e8467eea153fd717602e982d56902 (diff) | |
| download | chromium_src-cf4f689f6917abc305c0960619d683b0bc00cce3.zip chromium_src-cf4f689f6917abc305c0960619d683b0bc00cce3.tar.gz chromium_src-cf4f689f6917abc305c0960619d683b0bc00cce3.tar.bz2 | |
snappy: Add back the generated config.h for mac.
This config.h was brought back from commit:
https://chromium.googlesource.com/chromium/chromium/+/ace16e7626c7ba33a630960b913b54e1513187fc
This should make possible to build snappy_unittest target again on Mac.
BUG=None
TEST=snappy_unittest builds and runs on Mac.
R=jsbell@chromium.org
Review URL: https://codereview.chromium.org/362433002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/snappy/snappy.gyp')
| -rw-r--r-- | third_party/snappy/snappy.gyp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/third_party/snappy/snappy.gyp b/third_party/snappy/snappy.gyp index 877c2a0..da23700 100644 --- a/third_party/snappy/snappy.gyp +++ b/third_party/snappy/snappy.gyp @@ -48,11 +48,11 @@ }, 'cflags': [ '-Wno-header-hygiene' ], }], - ['OS=="linux"', { + ['OS=="linux" or OS=="mac"', { 'defines': [ - # TODO(tfarina): Only Linux has the generated config.h for now. - # Generate the config.h in the other platforms: mac, win and enable - # this for everyone. + # TODO(tfarina): Only Mac and Linux has the generated config.h for + # now. Generate the config.h for Windows too and enable this there + # as well. 'HAVE_CONFIG_H=1', ], }], @@ -70,9 +70,6 @@ { 'target_name': 'snappy_unittest', 'type': 'executable', - 'defines': [ - 'HAVE_CONFIG_H=1', - ], 'sources': [ 'src/snappy-test.cc', 'src/snappy-test.h', @@ -85,6 +82,14 @@ '../../third_party/zlib/zlib.gyp:zlib', ], 'conditions': [ + ['OS=="linux" or OS=="mac"', { + 'defines': [ + # TODO(tfarina): Only Mac and Linux has the generated config.h for + # now. Generate the config.h for Windows too and enable this there + # as well. + 'HAVE_CONFIG_H=1', + ], + }], ['clang == 1', { 'cflags': [ '-Wno-return-type', |