diff options
| author |  David Garcia Quintas <dgq@google.com> | 2017-04-28 14:37:17 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2017-04-28 14:37:17 -0700 |
| commit | 81aae44858dc72a55461486d9ea192db25f4b890 (patch) | |
| tree | 2af2da81809a005a12e175f40b772f45f40bdff8 /binding.gyp | |
| parent | 365c52b47e8d322dfc0bdf15ddea2b598f3b4dbb (diff) | |
| parent | dc36f4df6aba60275a31227e1d29c4d20b6cadca (diff) | |
Merge branch 'v1.3.x' into master-upmerge-v1.3.x
Diffstat (limited to 'binding.gyp')
| -rw-r--r-- | binding.gyp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/binding.gyp b/binding.gyp index 582c61282f..1032dafe01 100644 --- a/binding.gyp +++ b/binding.gyp @@ -47,7 +47,11 @@ # will let users recompile gRPC to work without ALPN. 'grpc_alpn%': 'true', # Indicates that the library should be built with gcov. - 'grpc_gcov%': 'false' + 'grpc_gcov%': 'false', + # Indicates that the library should be built with compatibility for musl + # libc, so that it can run on Alpine Linux. This is only necessary if not + # building on Alpine Linux + 'grpc_alpine%': 'false' }, 'target_defaults': { 'configurations': { @@ -115,6 +119,11 @@ '-rdynamic', ], }], + ['grpc_alpine=="true"', { + 'defines': [ + 'GPR_MUSL_LIBC_COMPAT' + ] + }], ['OS!="win" and runtime=="electron"', { "defines": [ 'OPENSSL_NO_THREADS' @@ -535,6 +544,10 @@ } ] }, + ] + }], + ['OS == "win"', { + 'targets': [ # Only want to compile zlib under Windows { 'cflags': [ @@ -569,7 +582,6 @@ }] ], 'targets': [ - { 'cflags': [ '-std=c99', @@ -648,7 +660,6 @@ 'type': 'static_library', 'dependencies': [ 'gpr', - 'node_modules/cares/deps/cares/cares.gyp:cares', ], 'sources': [ 'src/core/lib/surface/init.c', @@ -953,7 +964,6 @@ "dependencies": [ "grpc", "gpr", - "node_modules/cares/deps/cares/cares.gyp:cares", ] }, { |