[Asterisk-code-review] Makefile.product_rules: Fix handling of DEBUG (repotools[master])

Kevin Harwell asteriskteam at digium.com
Thu Jan 21 11:43:55 CST 2021


Kevin Harwell has submitted this change. ( https://gerrit.asterisk.org/c/repotools/+/15330 )

Change subject: Makefile.product_rules: Fix handling of DEBUG
......................................................................

Makefile.product_rules: Fix handling of DEBUG

When invoking submake, the DEBUG variable wasn't being
passed down so "-O0 -g3" was always being overridden
to "-O3 -g0" when DEBUG=yes.

Change-Id: Ic63061bdd25b308137d0f25e1b4189ee735aec5c
---
M build_tools/Makefile.product_rules
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit



diff --git a/build_tools/Makefile.product_rules b/build_tools/Makefile.product_rules
index 59cb9ec..4d77a62 100644
--- a/build_tools/Makefile.product_rules
+++ b/build_tools/Makefile.product_rules
@@ -197,7 +197,7 @@
 $(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) BASE_CFLAGS="$(CFLAGS) $(DEBUG_CFLAGS)" 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=$(DEBUG) 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

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

Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-Change-Id: Ic63061bdd25b308137d0f25e1b4189ee735aec5c
Gerrit-Change-Number: 15330
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20210121/b7b86505/attachment.html>


More information about the asterisk-code-review mailing list