From 7196dfeccd3ae042efa48c39dafa1b92c3e2e4b3 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 23 Jan 2018 12:04:19 +0100 Subject: [PATCH] attempt fixing zlib compilation with gcc7.2 --- Makefile | 2 +- build.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ada461fb372..98a5bda0fa9 100644 --- a/Makefile +++ b/Makefile @@ -8372,7 +8372,7 @@ PUBLIC_HEADERS_C += \ LIBZ_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBZ_SRC)))) -$(LIBZ_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration $(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden +$(LIBZ_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration -Wno-implicit-fallthrough $(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden $(LIBDIR)/$(CONFIG)/libz.a: $(CARES_DEP) $(LIBZ_OBJS) $(E) "[AR] Creating $@" diff --git a/build.yaml b/build.yaml index 61f76f205cd..644da1be559 100644 --- a/build.yaml +++ b/build.yaml @@ -5052,7 +5052,7 @@ defaults: LDFLAGS: -g zlib: CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration - $(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden + -Wno-implicit-fallthrough $(W_NO_SHIFT_NEGATIVE_VALUE) -fvisibility=hidden openssl_fallback: base_uri: https://openssl.org/source/old/1.0.2/ extraction_dir: openssl-1.0.2f