[syslinux:pathbased] MCONFIG.embedded: make sure to honor options in MCONFIG.local
syslinux-bot for H. Peter Anvin
hpa at zytor.com
Sun Feb 28 18:54:08 PST 2010
Commit-ID: 3d360c8a2a20eb55bcc4d3462c5c032fe0831865
Gitweb: http://syslinux.zytor.com/commit/3d360c8a2a20eb55bcc4d3462c5c032fe0831865
Author: H. Peter Anvin <hpa at zytor.com>
AuthorDate: Sun, 28 Feb 2010 18:52:14 -0800
Committer: H. Peter Anvin <hpa at zytor.com>
CommitDate: Sun, 28 Feb 2010 18:52:14 -0800
MCONFIG.embedded: make sure to honor options in MCONFIG.local
In particular, make sure we can honor debug options in MCONFIG.local.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---
MCONFIG.embedded | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/MCONFIG.embedded b/MCONFIG.embedded
index e8879fc..1369265 100644
--- a/MCONFIG.embedded
+++ b/MCONFIG.embedded
@@ -35,8 +35,10 @@ GCCOPT += $(call gcc_ok,-mpreferred-stack-boundary=2,)
LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc)
LD += -m elf_i386
-CFLAGS = $(GCCOPT) -g $(GCCWARN) -Wno-sign-compare $(OPTFLAGS) $(INCLUDES)
-SFLAGS = $(CFLAGS) -D__ASSEMBLY__
+
+# Note: use += for CFLAGS and SFLAGS in case something is set in MCONFIG.local
+CFLAGS += $(GCCOPT) -g $(GCCWARN) -Wno-sign-compare $(OPTFLAGS) $(INCLUDES)
+SFLAGS += $(CFLAGS) -D__ASSEMBLY__
.SUFFIXES: .c .o .S .s .i .elf .com .bin .asm .lst .c32 .lss
More information about the Syslinux-commits
mailing list