diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-08-12 13:49:33 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-08-12 13:49:33 -0700 |
| commit | f914c1d9703fcbfe5e897e0eea0fc41c9cb5f5cf (patch) | |
| tree | 9514c8075191e0f4852fa6d975ce08c3dedb385f | |
| parent | b1b2115a26e53c32770248140644f7a34c11e0a2 (diff) | |
Add walkaround for github.com/c-ares/c-ares/issues/44
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | templates/Makefile.template | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -1251,6 +1251,8 @@ $(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) $(LIBDIR)/$(CONFIG)/c-ares/libcares.a: third_party/c-ares/configure diff --git a/templates/Makefile.template b/templates/Makefile.template index 324977fef2..c7cf495e32 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -893,6 +893,8 @@ 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) $(LIBDIR)/$(CONFIG)/c-ares/libcares.a: third_party/c-ares/configure |