diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-17 17:27:50 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-17 17:27:50 -0700 |
| commit | b6b3015a84a91fbece62d128a77fda7ff66fc2e1 (patch) | |
| tree | ecd83935739f0db8bd405470798d744ba10bbcd8 /templates | |
| parent | 2652b4d32108a5bfe4f6b64cca8d1bf0f9cd9903 (diff) | |
| parent | 4ec433741a0b163dd8d6ccf8452ebd37d3e16245 (diff) | |
Merge github.com:grpc/grpc into we-dont-need-no-backup
Conflicts:
include/grpc/compression.h
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index c155b20a72..6347ad8440 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -665,7 +665,7 @@ else endif endif $(Q)$(MAKE) -C third_party/openssl clean - $(Q)$(MAKE) -C third_party/openssl build_crypto build_ssl + $(Q)(unset CPPFLAGS; $(MAKE) -C third_party/openssl build_crypto build_ssl) $(Q)mkdir -p $(LIBDIR)/$(CONFIG)/openssl $(Q)cp third_party/openssl/libssl.a third_party/openssl/libcrypto.a $(LIBDIR)/$(CONFIG)/openssl |