<p>Alexander Traud has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16285">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BuildSystem: User CFLAGS should always have the last say.<br><br>ASTERISK-29583<br><br>Change-Id: I7ffbcebb76de88426438565154ac6d09dd1b9221<br>---<br>M Makefile<br>M Makefile.rules<br>2 files changed, 6 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/85/16285/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile b/Makefile</span><br><span>index a2e52f1..4bc1069 100644</span><br><span>--- a/Makefile</span><br><span>+++ b/Makefile</span><br><span>@@ -112,7 +112,7 @@</span><br><span> </span><br><span> # start the primary CFLAGS and LDFLAGS with any that were provided</span><br><span> # to the configure script</span><br><span style="color: hsl(0, 100%, 40%);">-_ASTCFLAGS:=$(CONFIG_CFLAGS) $(CONFIG_SIGNED_CHAR)</span><br><span style="color: hsl(120, 100%, 40%);">+_ASTCFLAGS:=$(CONFIG_SIGNED_CHAR)</span><br><span> _ASTLDFLAGS:=$(CONFIG_LDFLAGS)</span><br><span> </span><br><span> # Some build systems, such as the one in openwrt, like to pass custom target</span><br><span>diff --git a/Makefile.rules b/Makefile.rules</span><br><span>index 934e44a..63ebdb9 100644</span><br><span>--- a/Makefile.rules</span><br><span>+++ b/Makefile.rules</span><br><span>@@ -95,19 +95,16 @@</span><br><span>     _ASTCFLAGS_COVERAGE=</span><br><span> endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ifeq ($(findstring $(CONFIG_CFLAGS),$(_ASTCFLAGS)),)</span><br><span style="color: hsl(0, 100%, 40%);">-    _ASTCFLAGS+=$(CONFIG_CFLAGS)</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # shortcuts for common combinations of flags; these must be recursively expanded so that</span><br><span> # per-target settings will be applied</span><br><span style="color: hsl(0, 100%, 40%);">-CC_CFLAGS=$(PTHREAD_CFLAGS) $(_ASTCFLAGS) $(ASTCFLAGS)</span><br><span style="color: hsl(0, 100%, 40%);">-CXX_CFLAGS=$(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(_ASTCFLAGS) $(ASTCFLAGS))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+CC_CFLAGS=$(PTHREAD_CFLAGS) $(_ASTCFLAGS)</span><br><span> # Clang -Werror warning suppressions</span><br><span> ifeq ($(C_COMPILER_FAMILY),clang)</span><br><span style="color: hsl(0, 100%, 40%);">-      CC_CFLAGS+=-Wno-unused-value -Wno-parentheses-equality</span><br><span style="color: hsl(120, 100%, 40%);">+        CC_CFLAGS+=-Wno-unused-value -Wparentheses-equality</span><br><span> endif</span><br><span style="color: hsl(120, 100%, 40%);">+CC_CFLAGS+=$(CONFIG_CFLAGS) $(ASTCFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+CXX_CFLAGS=$(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(_ASTCFLAGS) $(ASTCFLAGS))</span><br><span> </span><br><span> ifeq ($(GNU_LD),1)</span><br><span> SO_SUPPRESS_SYMBOLS=-Wl,--version-script,$(subst .so,.exports,$@),--warn-common</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16285">change 16285</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/16285"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 19 </div>
<div style="display:none"> Gerrit-Change-Id: I7ffbcebb76de88426438565154ac6d09dd1b9221 </div>
<div style="display:none"> Gerrit-Change-Number: 16285 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>