[Asterisk-code-review] Fix Makefile.product rules to pass correct CFLAGS (repotools[master])

[George Joseph]

George Joseph has uploaded this change for review. ( https://gerrit.asterisk.org/10807


Change subject: Fix Makefile.product_rules to pass correct CFLAGS
......................................................................

Fix Makefile.product_rules to pass correct CFLAGS

Change-Id: I340740ada82539fc69dd112113599b67746430fa
---
M build_tools/Makefile.product_rules
1 file changed, 3 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/repotools refs/changes/07/10807/1

diff --git a/build_tools/Makefile.product_rules b/build_tools/Makefile.product_rules
index ac1e130..726fe75 100644
--- a/build_tools/Makefile.product_rules
+++ b/build_tools/Makefile.product_rules
@@ -179,7 +179,7 @@
 
 CFLAGS+=$(MODULE_SDK_CFLAGS)
 
-%.o: CFLAGS+=-DAST_MODULE=\"$(LIBRARY_BASE_NAME)\" -DAST_MODULE_SELF_SYM=__internal_$(LIBRARY_BASE_NAME)_self -I$(ASTINCDIR)
+%.o: CFLAGS=$(BASE_CFLAGS) -DAST_MODULE=\"$(LIBRARY_BASE_NAME)\" -DAST_MODULE_SELF_SYM=__internal_$(LIBRARY_BASE_NAME)_self -I$(ASTINCDIR)
 %.o: %.c optarch.h version.h
 	$(ECHO_PREFIX) echo "  [CC] $(LIBRARY_BASE_NAME):$@"
 	$(CMD_PREFIX) $(CC) -c $< -o $@ $(PJPROJECT_INCLUDES) $(CFLAGS) $(DEBUG_CFLAGS) $(WARN) $(MAKE_DEPS) $(COPYPROTECT_CFLAGS)
@@ -193,20 +193,19 @@
 		echo "  [EXPORTS CP] $(LIBRARY_BASE_NAME)" ;\
 		cp $(LIBRARY_BASE_NAME).exports $@ ;\
 	fi ;
-	
+
 $(MODULE_LIBS): LIBRARY_NAME=$(@)
 $(MODULE_LIBS): LIBRARY_BASE_NAME=$(basename $(LIBRARY_NAME))
 $(MODULE_LIBS): LINKER_SCRIPT=-Wl,--version-script,.$(basename $(LIBRARY_NAME)).exports
 $(MODULE_LIBS): SOLINK=-shared $(LINKER_SCRIPT)
 $(MODULE_LIBS): %.so: $(MODULE_SDK_OBJS) $(MODULE_SDK_LIB) | .%.exports
-	$(CMD_PREFIX) $(MAKE) --no-print-directory $(OBJS)  COPYPROTECT=$(COPYPROTECT) LIBRARY_BASE_NAME=$(LIBRARY_BASE_NAME) NOISY_BUILD=$(NOISY_BUILD) PJPROJECT_INCLUDES="$(PJPROJECT_INCLUDES)"
+	$(CMD_PREFIX) $(MAKE) --no-print-directory $(OBJS) BASE_CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS)" COPYPROTECT=$(COPYPROTECT) LIBRARY_BASE_NAME=$(LIBRARY_BASE_NAME) NOISY_BUILD=$(NOISY_BUILD) PJPROJECT_INCLUDES="$(PJPROJECT_INCLUDES)"
 	$(ECHO_PREFIX) echo "  [LD] $(LIBRARY_NAME) $(ARCH)"
 	$(CMD_PREFIX) $(CC) $(CFLAGS) $(DEBUG_CFLAGS) $(SOLINK) -o .$(LIBRARY_NAME) $(OBJS) $^ $(LDFLAGS) $(LIBS) $(COPYPROTECT_LIBS)
 	$(CMD_PREFIX) echo "$(MODULE_NAME),$(VARIANT),$(PRODUCT_VERSION)" >.$(LIBRARY_NAME).ast_manifest
 	$(CMD_PREFIX) $(OBJCOPY) --add-section .ast_manifest=.$(LIBRARY_NAME).ast_manifest --set-section-flags .ast_manifest=noload,readonly .$(LIBRARY_NAME) $(LIBRARY_NAME)
 	$(CMD_PREFIX) rm .$(LIBRARY_NAME) .$(LIBRARY_NAME).ast_manifest .*.exports 2>/dev/null || :
 
-	
 .PHONY: base nocp debug
 
 base: COPYPROTECT=yes

-- 
To view, visit https://gerrit.asterisk.org/10807
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I340740ada82539fc69dd112113599b67746430fa
Gerrit-Change-Number: 10807
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20181211/79f979b6/attachment.html>