diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-01-24 16:25:34 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-01-24 16:25:34 -0800 |
| commit | 95e6215b6f1d31eebdb1ddeb4c13007c5af30c23 (patch) | |
| tree | 5dbce6408bb350b242e5c4dd592da103ed6cfb86 /linux | |
| parent | 8f189531a58aef0655cd04a620931da3a0157eaa (diff) | |
| parent | 1da816e5101d61edc8a01e3c76a1b89933a8b863 (diff) | |
| download | syslinux-95e6215b6f1d31eebdb1ddeb4c13007c5af30c23.tar.gz | |
Merge branch 'master' into fsc
Conflicts:
com32/lib/MCONFIG
com32/lib/readdir.c
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/Makefile b/linux/Makefile index a469cefd..8872c0fc 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -19,7 +19,7 @@ include $(topdir)/MCONFIG OPTFLAGS = -g -Os INCLUDES = -I. -I.. -I../libinstaller -CFLAGS = -W -Wall -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) +CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) LDFLAGS = -s SRCS = syslinux.c \ |