diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-08-15 13:46:59 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-08-15 13:46:59 -0700 |
| commit | 7ef54b662f7993e425e44c28362bbbc99d49ca18 (patch) | |
| tree | d982e10268fd4850664445a2a5758fea60b958bd | |
| parent | 979937315fad5844c4923fa96a19ef0b0e00e1cb (diff) | |
Fix sed failure on mac
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | templates/Makefile.template | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -1252,9 +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\])/{} # issue 44/g' third_party/c-ares/configure.ac + $(Q)sed -i'.bak' -e '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 --disable-shared) - $(Q)sed -i 's/{} # issue 44/AC_CONFIG_SUBDIRS(\[test\])/g' third_party/c-ares/configure.ac + $(Q)mv third_party/c-ares/configure.ac.bak 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 fd7d492a4d..b29bf7eda8 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -894,9 +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\])/{} # issue 44/g' third_party/c-ares/configure.ac + $(Q)sed -i'.bak' -e '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 --disable-shared) - $(Q)sed -i 's/{} # issue 44/AC_CONFIG_SUBDIRS(\[test\])/g' third_party/c-ares/configure.ac + $(Q)mv third_party/c-ares/configure.ac.bak third_party/c-ares/configure.ac $(LIBDIR)/$(CONFIG)/c-ares/libcares.a: third_party/c-ares/configure $(E) "[MAKE] Building c-ares" |