2019-12-25 18:06:46 +08:00
|
|
|
From 63c843f040cd5e9503bdcdf9b3285ef371bcadb6 Mon Sep 17 00:00:00 2001
|
2019-09-30 10:51:59 -04:00
|
|
|
From: Sergey Avseyev <sergey.avseyev@gmail.com>
|
2019-12-25 18:06:46 +08:00
|
|
|
Date: Sat, 21 Dec 2019 19:05:23 +0800
|
2019-09-30 10:51:59 -04:00
|
|
|
Subject: [PATCH] patch from #15532
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
Makefile | 6 +++---
|
|
|
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/Makefile b/Makefile
|
2019-12-25 18:06:46 +08:00
|
|
|
index 51a355b..9abd5df 100644
|
2019-09-30 10:51:59 -04:00
|
|
|
--- a/Makefile
|
|
|
|
|
+++ b/Makefile
|
|
|
|
|
@@ -348,7 +348,7 @@ HOST_LD ?= $(LD)
|
|
|
|
|
HOST_LDXX ?= $(LDXX)
|
|
|
|
|
|
|
|
|
|
CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
|
|
|
|
|
-CXXFLAGS += -std=c++11
|
|
|
|
|
+CXXFLAGS += -std=c++11 -Wno-class-memaccess -Wno-ignored-qualifiers -Wno-stringop-truncation -Wno-sizeof-pointer-div
|
|
|
|
|
ifeq ($(SYSTEM),Darwin)
|
|
|
|
|
CXXFLAGS += -stdlib=libc++
|
|
|
|
|
endif
|
2019-12-25 18:06:46 +08:00
|
|
|
@@ -8304,7 +8304,7 @@ LIBBORINGSSL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename
|
2019-09-30 10:51:59 -04:00
|
|
|
|
|
|
|
|
$(LIBBORINGSSL_OBJS): CPPFLAGS += -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
|
|
|
|
|
$(LIBBORINGSSL_OBJS): CXXFLAGS += -fno-rtti -fno-exceptions
|
|
|
|
|
-$(LIBBORINGSSL_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare -Wno-implicit-fallthrough $(NO_W_EXTRA_SEMI)
|
|
|
|
|
+$(LIBBORINGSSL_OBJS): CFLAGS += -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-unknown-pragmas -Wno-implicit-function-declaration -Wno-unused-variable -Wno-sign-compare -Wno-implicit-fallthrough -Wno-cast-function-type $(NO_W_EXTRA_SEMI)
|
|
|
|
|
|
|
|
|
|
$(LIBDIR)/$(CONFIG)/libboringssl.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBBORINGSSL_OBJS)
|
|
|
|
|
$(E) "[AR] Creating $@"
|
2019-12-25 18:06:46 +08:00
|
|
|
@@ -8548,7 +8548,7 @@ PUBLIC_HEADERS_C += \
|
2019-09-30 10:51:59 -04:00
|
|
|
LIBARES_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBARES_SRC))))
|
|
|
|
|
|
|
|
|
|
$(LIBARES_OBJS): CPPFLAGS += -Ithird_party/cares -Ithird_party/cares/cares -fvisibility=hidden -D_GNU_SOURCE $(if $(subst Darwin,,$(SYSTEM)),,-Ithird_party/cares/config_darwin) $(if $(subst FreeBSD,,$(SYSTEM)),,-Ithird_party/cares/config_freebsd) $(if $(subst Linux,,$(SYSTEM)),,-Ithird_party/cares/config_linux) $(if $(subst OpenBSD,,$(SYSTEM)),,-Ithird_party/cares/config_openbsd) -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX $(if $(subst MINGW32,,$(SYSTEM)),-DHAVE_CONFIG_H,)
|
|
|
|
|
-$(LIBARES_OBJS): CFLAGS += -Wno-sign-conversion $(if $(subst Darwin,,$(SYSTEM)),,-Wno-shorten-64-to-32) $(if $(subst MINGW32,,$(SYSTEM)),-Wno-invalid-source-encoding,)
|
|
|
|
|
+$(LIBARES_OBJS): CFLAGS += -Wno-sign-conversion -Wno-sizeof-pointer-memaccess -Wno-stringop-overflow $(if $(subst Darwin,,$(SYSTEM)),,-Wno-shorten-64-to-32) $(if $(subst MINGW32,,$(SYSTEM)),-Wno-invalid-source-encoding,)
|
|
|
|
|
|
|
|
|
|
$(LIBDIR)/$(CONFIG)/libares.a: $(LIBARES_OBJS)
|
|
|
|
|
$(E) "[AR] Creating $@"
|
|
|
|
|
--
|
|
|
|
|
2.19.1
|
|
|
|
|
|
