From d1589159c3b1eb9ffa1b83e7fc01d6c8d3d87b67 Mon Sep 17 00:00:00 2001 From: Masaki Hara Date: Fri, 8 Jan 2021 15:06:38 +0900 Subject: [PATCH] Always apply -DHAVE_UNISTD_H This commit also moves the CPPFLAGS config from Makefile, which is autogenerated, to build_handwritten.yaml, which is literally handwritten. --- Makefile | 2 -- build_handwritten.yaml | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 240cb68c523..d579d663618 100644 --- a/Makefile +++ b/Makefile @@ -2455,9 +2455,7 @@ PUBLIC_HEADERS_C += \ LIBZ_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBZ_SRC)))) $(LIBZ_OBJS): CFLAGS += -fvisibility=hidden -ifeq ($(SYSTEM),Darwin) $(LIBZ_OBJS): CPPFLAGS += -DHAVE_UNISTD_H -endif $(LIBDIR)/$(CONFIG)/libz.a: $(LIBZ_OBJS) $(E) "[AR] Creating $@" diff --git a/build_handwritten.yaml b/build_handwritten.yaml index 3993ecc4c7c..8a5d811e19b 100644 --- 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