diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-05-05 10:10:26 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-05-05 10:10:26 -0700 |
| commit | 9739a2a54dad8cd7f88566ca2819a74d2def81ec (patch) | |
| tree | 683f170b1b5d44a2c8c787a69698289653259c01 /build.yaml | |
| parent | c0a9d1f4252763fe0a37ad9cb6046918ce94a034 (diff) | |
| parent | 6815e414a4dbca4d0d4dd62b5ec3c6faa60c9bb9 (diff) | |
Merge branch 'master' into epoll_thread_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 bb4a0b6410..3e16ca8ae2 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: |