diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-08-12 14:17:48 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-08-12 14:17:48 -0700 |
| commit | 979937315fad5844c4923fa96a19ef0b0e00e1cb (patch) | |
| tree | af6e2512196c955c0cf35fd84473db8ecea9ebdc /templates | |
| parent | f914c1d9703fcbfe5e897e0eea0fc41c9cb5f5cf (diff) | |
Try to fix clang3.6+ build
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index c7cf495e32..fd7d492a4d 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" |