| From 7e2d98df390787797fa494b26c72896f16f6e2a6 Mon Sep 17 00:00:00 2001 |
| From: Georgy Yakovlev <gyakovlev@gentoo.org> |
| Date: Sat, 30 Jun 2018 00:21:53 -0700 |
| Subject: [PATCH] Makefile: fix host ar handling |
| |
| Cherry picked lines from |
| https://github.com/grpc/grpc/pull/11476 |
| --- |
| Makefile | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/Makefile b/Makefile |
| index 8333858588..b5a44b7096 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -328,6 +328,7 @@ HOST_CC ?= $(CC) |
| HOST_CXX ?= $(CXX) |
| HOST_LD ?= $(LD) |
| HOST_LDXX ?= $(LDXX) |
| +HOST_AR ?= $(AR) |
| |
| CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI) |
| CXXFLAGS += -std=c++11 |
| @@ -444,6 +445,7 @@ HOST_CFLAGS = $(CFLAGS) |
| HOST_CXXFLAGS = $(CXXFLAGS) |
| HOST_LDFLAGS = $(LDFLAGS) |
| HOST_LDLIBS = $(LDLIBS) |
| +HOST_AROPTS = $(AROPTS) |
| |
| # These are automatically computed variables. |
| # There shouldn't be any need to change anything from now on. |
| @@ -6886,10 +6888,10 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error |
| else |
| |
| $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) |
| - $(E) "[AR] Creating $@" |
| + $(E) "[HOSTAR] Creating $@" |
| $(Q) mkdir -p `dirname $@` |
| $(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a |
| - $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) |
| + $(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) |
| ifeq ($(SYSTEM),Darwin) |
| $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a |
| endif |
| -- |
| 2.18.0 |
| |
