diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-05-04 22:02:47 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-05-04 22:02:47 +0000 |
| commit | 62800f789cd407805c24850df23ef45939d20d16 (patch) | |
| tree | c3cbe2c8615e4c8a731d364042b9a11bf02e408b /build.yaml | |
| parent | bc7c224cac5cebc7b8cef0c6b14151f237eef8dd (diff) | |
| parent | f31a80eac3fc507060f33c651bb13a6c3eaffab7 (diff) | |
Merge github.com:grpc/grpc into timer_pool
Diffstat (limited to 'build.yaml')
| -rw-r--r-- | build.yaml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/build.yaml b/build.yaml index 941aedc222..ab176b6783 100644 --- a/build.yaml +++ b/build.yaml @@ -4514,10 +4514,11 @@ configs: UBSAN_OPTIONS: halt_on_error=1:print_stacktrace=1:suppressions=tools/ubsan_suppressions.txt defaults: ares: - CFLAGS: -Wno-sign-conversion -Wno-invalid-source-encoding + CFLAGS: -Wno-sign-conversion $(if $(subst MINGW32,,$(SYSTEM)),-Wno-invalid-source-encoding,) CPPFLAGS: -Ithird_party/cares -Ithird_party/cares/cares $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) -fvisibility=hidden - -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DHAVE_CONFIG_H + -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(if $(subst + MINGW32,,$(SYSTEM)),-DHAVE_CONFIG_H,) benchmark: CPPFLAGS: -Ithird_party/benchmark/include -DHAVE_POSIX_REGEX boringssl: @@ -4563,13 +4564,10 @@ node_modules: - src/node/ext/call_credentials.cc - src/node/ext/channel.cc - src/node/ext/channel_credentials.cc - - src/node/ext/completion_queue_threadpool.cc - - src/node/ext/completion_queue_uv.cc + - src/node/ext/completion_queue.cc - src/node/ext/node_grpc.cc - src/node/ext/server.cc - src/node/ext/server_credentials.cc - - src/node/ext/server_generic.cc - - src/node/ext/server_uv.cc - src/node/ext/slice.cc - src/node/ext/timeval.cc openssl_fallback: |