Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Try to fix clang3.6+ build

Browse Source
pull/7759/head
Yuchen Zeng 8 years ago
parent f914c1d970
commit 979937315f
2 changed files with 6 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      Makefile
  2. 5
      templates/Makefile.template

5
Makefile
Unescape View File

@ -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"

5
templates/Makefile.template
Unescape View File

@ -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"

Write Preview
Loading…
Cancel
Save