diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-06-15 11:13:46 -0400 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-06-15 11:13:46 -0400 |
| commit | c14e95fc63302421b71f0939a71d3a2b32c8ab1f (patch) | |
| tree | 7a5a865423be974130cd24d3e70067052d6b9d8e /grpc.gyp | |
| parent | c7166ae67dd554d41b4d26286da2888aebc0153b (diff) | |
| parent | bd6ac0f9d57dda96797bbd5b1bd27815342e7ee5 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz
Diffstat (limited to 'grpc.gyp')
| -rw-r--r-- | grpc.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -59,6 +59,8 @@ '-Wno-unused-parameter', '-DOSATOMIC_USE_INLINED=1', '-Wno-deprecated-declarations', + '-Ithird_party/nanopb', + '-DPB_FIELD_32BIT', ], 'ldflags': [ '-g', @@ -137,6 +139,8 @@ '-Wno-unused-parameter', '-DOSATOMIC_USE_INLINED=1', '-Wno-deprecated-declarations', + '-Ithird_party/nanopb', + '-DPB_FIELD_32BIT', ], 'OTHER_CPLUSPLUSFLAGS': [ '-g', @@ -147,6 +151,8 @@ '-Wno-unused-parameter', '-DOSATOMIC_USE_INLINED=1', '-Wno-deprecated-declarations', + '-Ithird_party/nanopb', + '-DPB_FIELD_32BIT', '-stdlib=libc++', '-std=c++11', '-Wno-error=deprecated-declarations', |