diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-02-25 15:25:16 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-02-26 11:29:04 +0000 |
| commit | 76da2ae050d72a31fd47c2fb53f7081781de62ff (patch) | |
| tree | 6da146b5f19ca17ff24d4e74940f14264d38f914 /mk/syslinux.mk | |
| parent | 41c29c26d70fde563d7c255872bbadad87a39dfa (diff) | |
| parent | 79312306de0150ef64213ef9fbc5aa8580544f03 (diff) | |
| download | syslinux-76da2ae050d72a31fd47c2fb53f7081781de62ff.tar.gz | |
Merge branch 'lwip' into elflink
Welcome to Syslinux 5.10.
Conflicts:
NEWS
com32/lib/Makefile
com32/lib/sys/open.c
com32/lib/syslinux/ipappend.c
com32/modules/Makefile
com32/modules/prdhcp.c
core/Makefile
core/cmdline.inc
core/com32.inc
core/comboot.inc
core/configinit.inc
core/fs/chdir.c
core/fs/fs.c
core/fs/pxe/dnsresolv.c
core/fs/pxe/pxe.c
core/fs/pxe/pxe.h
core/idle.c
core/include/ctype.h
core/init.inc
core/mem/init.c
core/parseconfig.inc
core/runkernel.inc
core/syslinux.ld
core/ui.inc
doc/comboot.txt
version
Diffstat (limited to 'mk/syslinux.mk')
| -rw-r--r-- | mk/syslinux.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mk/syslinux.mk b/mk/syslinux.mk index 1378b6d5..2e12072e 100644 --- a/mk/syslinux.mk +++ b/mk/syslinux.mk @@ -32,8 +32,13 @@ COM32DIR = $(AUXDIR)/com32 BOOTDIR = /boot EXTLINUXDIR = $(BOOTDIR)/extlinux +ifdef DEBUG +# This allows DEBUGOPT to be set from the command line +DEBUGOPT = -DDEBUG=$(DEBUG) +endif + NASM = nasm -NASMOPT = -Ox +NASMOPT = -Ox $(DEBUGOPT) PERL = perl PYTHON = python @@ -68,9 +73,7 @@ WGET = wget com32 = $(topdir)/com32 # Common warnings we want for all gcc-generated code -GCCWARN := -W -Wall -Wstrict-prototypes -# Extremely useful variant for debugging... -#GCCWARN += -Wno-clobbered -Werror +GCCWARN = -W -Wall -Wstrict-prototypes $(DEBUGOPT) # Common stanza to make gcc generate .*.d dependency files MAKEDEPS = -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d |