aboutsummaryrefslogtreecommitdiffstats
path: root/extlinux
diff options
context:
space:
mode:
authorStefan Bucur <stefanb@zytor.com>2008-05-12 21:47:23 +0300
committerStefan Bucur <stefanb@zytor.com>2008-05-12 21:47:23 +0300
commit4561fc3586957f5d745bc9eb3baf8d859897da17 (patch)
tree1789353f8744b40090c74f5ebb924ef0079fb23a /extlinux
parente31a673cc14223db120f363dcd6ecc491125f622 (diff)
downloadsyslinux-elf-4561fc3586957f5d745bc9eb3baf8d859897da17.tar.gz
syslinux-elf-4561fc3586957f5d745bc9eb3baf8d859897da17.tar.xz
syslinux-elf-4561fc3586957f5d745bc9eb3baf8d859897da17.zip
Fixed the various Makefiles so that SYSLINUX compiles on platforms with GCC -fstack-protector flag enabled by default.
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 9dd7ec94..f4267020 100644
--- a/extlinux/Makefile
+++ b/extlinux/Makefile
@@ -1,4 +1,5 @@
TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
+CC = gcc
gcc_ok = $(shell tmpf=$(TMPFILE); if $(CC) $(1) ../dummy.c -o $$tmpf 2>/dev/null; \
then echo '$(1)'; else echo '$(2)'; fi; rm -f $$tmpf)
@@ -6,7 +7,6 @@ gcc_ok = $(shell tmpf=$(TMPFILE); if $(CC) $(1) ../dummy.c -o $$tmpf 2>/dev/nu
comma := ,
LDHASH := $(call gcc_ok,-Wl$(comma)--hash-style=both,)
-CC = gcc
OPTFLAGS = -g -Os
INCLUDES = -I. -I.. -I../libinstaller
CFLAGS = -W -Wall -Wno-sign-compare -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)