Merge pull request #25133 from apolcyn/backport_fix_zlib_implicit_declaration

Backport "Fix implicit declaration error in zlib + macOS #24979"
4 years ago · 96d2e95dd7
parent a9bf88bae3 58ef4d7135
commit 96d2e95dd7
2 changed files with 2 additions and 0 deletions
--- a/1
+++ b/1
@ -2455,6 +2455,7 @@ PUBLIC_HEADERS_C += \
 LIBZ_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBZ_SRC))))

 $(LIBZ_OBJS): CFLAGS += -fvisibility=hidden
+$(LIBZ_OBJS): CPPFLAGS += -DHAVE_UNISTD_H

 $(LIBDIR)/$(CONFIG)/libz.a:  $(LIBZ_OBJS) 
 	$(E) "[AR]      Creating $@"
--- a/build_handwritten.yaml
+++ b/build_handwritten.yaml
@ -216,6 +216,7 @@ defaults:
    LDFLAGS: -g
  zlib:
    CFLAGS: -fvisibility=hidden
+    CPPFLAGS: -DHAVE_UNISTD_H
 php_config_m4:
  deps:
  - grpc