From 979937315fad5844c4923fa96a19ef0b0e00e1cb Mon Sep 17 00:00:00 2001
From: Yuchen Zeng <zyc@google.com>
Date: Fri, 12 Aug 2016 14:17:48 -0700
Subject: [PATCH] Try to fix clang3.6+ build

---
 Makefile                    | 5 +++--
 templates/Makefile.template | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index a08fedbf711..61e71be9dc2 100644
--- a/Makefile
+++ b/Makefile
@@ -1252,8 +1252,9 @@ $(LIBDIR)/$(CONFIG)/protobuf/libprotobuf.a: third_party/protobuf/configure
 third_party/c-ares/configure:
 	$(E) "[AUTOGEN] Preparing c-ares"
 	# Walkaround for github.com/c-ares/c-ares/issues/44
-	$(Q)sed -i 's/AC_CONFIG_SUBDIRS(\[test\])/{}/g' third_party/c-ares/configure.ac
-	$(Q)(cd third_party/c-ares; ./buildconf; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g $(CARES_LDFLAGS_EXTRA)" CFLAGS="-g $(CARES_CFLAGS_EXTRA)" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g $(CARES_CPPFLAGS_EXTRA)" ./configure)
+	$(Q)sed -i 's/AC_CONFIG_SUBDIRS(\[test\])/{} # issue 44/g' third_party/c-ares/configure.ac
+	$(Q)(cd third_party/c-ares; ./buildconf; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g $(CARES_LDFLAGS_EXTRA)" CFLAGS="-g $(CARES_CFLAGS_EXTRA)" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g $(CARES_CPPFLAGS_EXTRA)" ./configure --disable-shared)
+	$(Q)sed -i 's/{} # issue 44/AC_CONFIG_SUBDIRS(\[test\])/g' third_party/c-ares/configure.ac
 
 $(LIBDIR)/$(CONFIG)/c-ares/libcares.a: third_party/c-ares/configure
 	$(E) "[MAKE]    Building c-ares"
diff --git a/templates/Makefile.template b/templates/Makefile.template
index c7cf495e326..fd7d492a4d5 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -894,8 +894,9 @@
   third_party/c-ares/configure:
   	$(E) "[AUTOGEN] Preparing c-ares"
   	# Walkaround for github.com/c-ares/c-ares/issues/44
-  	$(Q)sed -i 's/AC_CONFIG_SUBDIRS(\[test\])/{}/g' third_party/c-ares/configure.ac
-  	$(Q)(cd third_party/c-ares; ./buildconf; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g $(CARES_LDFLAGS_EXTRA)" CFLAGS="-g $(CARES_CFLAGS_EXTRA)" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g $(CARES_CPPFLAGS_EXTRA)" ./configure)
+  	$(Q)sed -i 's/AC_CONFIG_SUBDIRS(\[test\])/{} # issue 44/g' third_party/c-ares/configure.ac
+  	$(Q)(cd third_party/c-ares; ./buildconf; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g $(CARES_LDFLAGS_EXTRA)" CFLAGS="-g $(CARES_CFLAGS_EXTRA)" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g $(CARES_CPPFLAGS_EXTRA)" ./configure --disable-shared)
+  	$(Q)sed -i 's/{} # issue 44/AC_CONFIG_SUBDIRS(\[test\])/g' third_party/c-ares/configure.ac
 
   $(LIBDIR)/$(CONFIG)/c-ares/libcares.a: third_party/c-ares/configure
   	$(E) "[MAKE]    Building c-ares"