Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable
Conflicts:
BUILD
Makefile
binding.gyp
build.yaml
gRPC.podspec
grpc.gemspec
package.json
src/python/grpcio/grpc_core_dependencies.py
templates/Makefile.template
tools/doxygen/Doxyfile.core.internal
tools/run_tests/sources_and_headers.json
vsprojects/vcxproj/gpr/gpr.vcxproj
vsprojects/vcxproj/gpr/gpr.vcxproj.filters
diff --git a/build.yaml b/build.yaml
index d30a395..8d38b6a 100644
--- a/build.yaml
+++ b/build.yaml
@@ -107,6 +107,7 @@
- src/core/support/time_precise.c
- src/core/support/time_win32.c
- src/core/support/tls_pthread.c
+ - src/core/support/wrap_memcpy.c
- name: grpc++_base
public_headers:
- include/grpc++/channel.h
@@ -841,6 +842,7 @@
- src/csharp/ext/grpc_csharp_ext.c
deps:
- grpc
+ LDFLAGS: $(if $(subst Linux,,$(SYSTEM)),,-Wl$(comma)-wrap$(comma)memcpy)
deps_linkage: static
dll: only
vs_config_type: DynamicLibrary