aboutsummaryrefslogtreecommitdiffstats
path: root/com32/MCONFIG
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-01-24 16:25:34 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-01-24 16:25:34 -0800
commit95e6215b6f1d31eebdb1ddeb4c13007c5af30c23 (patch)
tree5dbce6408bb350b242e5c4dd592da103ed6cfb86 /com32/MCONFIG
parent8f189531a58aef0655cd04a620931da3a0157eaa (diff)
parent1da816e5101d61edc8a01e3c76a1b89933a8b863 (diff)
downloadsyslinux-95e6215b6f1d31eebdb1ddeb4c13007c5af30c23.tar.gz
syslinux-95e6215b6f1d31eebdb1ddeb4c13007c5af30c23.tar.xz
syslinux-95e6215b6f1d31eebdb1ddeb4c13007c5af30c23.zip
Merge branch 'master' into fsc
Conflicts: com32/lib/MCONFIG com32/lib/readdir.c
Diffstat (limited to 'com32/MCONFIG')
-rw-r--r--com32/MCONFIG6
1 files changed, 3 insertions, 3 deletions
diff --git a/com32/MCONFIG b/com32/MCONFIG
index 3af015e1..80f92f6c 100644
--- a/com32/MCONFIG
+++ b/com32/MCONFIG
@@ -44,11 +44,11 @@ GPLLIB =
GPLINCLUDE =
endif
-CFLAGS = $(GCCOPT) -W -Wall -march=i386 \
+CFLAGS = $(GCCOPT) $(GCCWARN) -march=i386 \
-fomit-frame-pointer -D__COM32__ \
-nostdinc -iwithprefix include \
-I$(com32)/libutil/include -I$(com32)/include $(GPLINCLUDE)
-SFLAGS = $(GCCOPT) -W -Wall -march=i386 \
+SFLAGS = $(GCCOPT) $(GCCWARN) -march=i386 \
-fomit-frame-pointer -D__COM32__ \
-nostdinc -iwithprefix include \
-I$(com32)/libutil/include -I$(com32)/include $(GPLINCLUDE)
@@ -57,7 +57,7 @@ COM32LD = $(com32)/lib/com32.ld
LDFLAGS = -m elf_i386 --emit-relocs -T $(COM32LD)
LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc)
-LNXCFLAGS = -I$(com32)/libutil/include -W -Wall -O -g -D_GNU_SOURCE
+LNXCFLAGS = -I$(com32)/libutil/include $(GCCWARN) -O -g -D_GNU_SOURCE
LNXSFLAGS = -g
LNXLDFLAGS = -g