diff options
| author |  David G. Quintas <dgq@google.com> | 2017-05-04 10:44:03 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-05-04 10:44:03 -0700 |
| commit | c2ad372d43c1fd31d9e9dabb8a5481c641b9a81a (patch) | |
| tree | 052dbd8af8d4d0b0f296185a329ad2336ca3db83 /build.yaml | |
| parent | cbecd7260995383537bd63e91bf53939ddb6e3bf (diff) | |
| parent | 46758c39101395a757a7883b4e8108b39193cafb (diff) | |
Merge pull request #10912 from dgquintas/trying-to-fix-stuff
Upmerge from 1.3.0 to master
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 865beab481..b293060234 100644 --- a/build.yaml +++ b/build.yaml @@ -4512,10 +4512,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: @@ -4561,13 +4562,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: |