diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-10-28 15:41:58 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-10-28 15:41:58 -0700 |
| commit | c76e9d3062ac1286735be77887f7c4be511d77df (patch) | |
| tree | 830593ef736b724de6d63ef60aace2189259437b /templates/Makefile.template | |
| parent | e8d830930182f52c5381117746395b303099b5c2 (diff) | |
| parent | 086e28d5f5eba09576c18cef075a3434de2caaa7 (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_buildin
Diffstat (limited to 'templates/Makefile.template')
| -rw-r--r-- | templates/Makefile.template | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index d4da968a52..b89ce42880 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -219,10 +219,6 @@ HOST_LD ?= $(LD) HOST_LDXX ?= $(LDXX) - ifdef EXTRA_DEFINES - DEFINES += $(EXTRA_DEFINES) - endif - CFLAGS += -std=c99 -Wsign-conversion -Wconversion ${' '.join(warning_var('$(W_%s)', warning) for warning in PREFERRED_WARNINGS)} ifeq ($(HAS_CXX11),true) CXXFLAGS += -std=c++11 @@ -324,6 +320,11 @@ LDLIBS += $(addprefix -l, $(LIBS)) LDLIBSXX += $(addprefix -l, $(LIBSXX)) + + % for arg in ['CFLAGS', 'CXXFLAGS', 'CPPFLAGS', 'LDFLAGS', 'DEFINES', 'LDLIBS']: + ${arg} += $(EXTRA_${arg}) + % endfor + HOST_CPPFLAGS = $(CPPFLAGS) HOST_CFLAGS = $(CFLAGS) HOST_CXXFLAGS = $(CXXFLAGS) |