summaryrefslogtreecommitdiffstats
path: root/extlinux
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-10 15:59:46 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-10 15:59:46 -0800
commite8d0e6fb18aae44474e864d8040d5ed44ff6acab (patch)
tree547115848f342060950112d85b83706ef12fd800 /extlinux
parent5396e250a679c368b3dd353c730358d6c54960c8 (diff)
parent2dafb8402ed666b37f96f6e1579a99b8a8c85452 (diff)
downloadsyslinux-e8d0e6fb18aae44474e864d8040d5ed44ff6acab.tar.gz
syslinux-e8d0e6fb18aae44474e864d8040d5ed44ff6acab.tar.xz
syslinux-e8d0e6fb18aae44474e864d8040d5ed44ff6acab.zip
Merge branch 'fsc' into pathbased
Resolved Conflicts: core/fs/ext2/ext2.c Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'extlinux')
-rw-r--r--extlinux/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/extlinux/Makefile b/extlinux/Makefile
index 48105338..23ffd400 100644
--- a/extlinux/Makefile
+++ b/extlinux/Makefile
@@ -19,7 +19,7 @@ include $(topdir)/MCONFIG
OPTFLAGS = -g -Os
INCLUDES = -I. -I.. -I../libinstaller
-CFLAGS = -W -Wall -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \
+CFLAGS = $(GCCWARN) -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \
$(OPTFLAGS) $(INCLUDES)
LDFLAGS = # -s