diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-08-09 21:09:12 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-08-09 21:09:12 -0700 |
| commit | d284493a63e676163584e1cc8be9fbe379d2e831 (patch) | |
| tree | a3bf14a2af3c0ed8b9d3dbca5e5c37110ff2be76 /templates | |
| parent | 8917aecf56265e09df657de79dd7ec28e704e3f6 (diff) | |
Fix asan issue, ignore invalid-source-encoding warning when building c-ares with clang
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 507e1f8293..19ba658095 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -564,6 +564,7 @@ CARES_DEP = $(LIBDIR)/$(CONFIG)/c-ares/libcares.a CPPFLAGS := -Ithird_party/c-ares $(CPPFLAGS) LDFLAGS := -L$(LIBDIR)/$(CONFIG)/c-ares $(LDFLAGS) + CARES_CFLAGS_EXTRA = -Wno-invalid-source-encoding else DEP_MISSING += c-ares endif @@ -884,7 +885,7 @@ third_party/c-ares/configure: $(E) "[AUTOGEN] Preparing c-ares" - $(Q)(cd third_party/c-ares; ./buildconf; CC="$(CC)" CXX="$(CXX)" LDFLAGS="$(LDFLAGS_$(CONFIG)) -g $(CARES_LDFLAGS_EXTRA)" CPPFLAGS="$(PIC_CPPFLAGS) $(CPPFLAGS_$(CONFIG)) -g $(CARES_CPPFLAGS_EXTRA)" ./configure) + $(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 $(E) "[MAKE] Building c-ares" |