aboutsummaryrefslogtreecommitdiffstats
path: root/sample
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 /sample
parente31a673cc14223db120f363dcd6ecc491125f622 (diff)
downloadsyslinux-4561fc3586957f5d745bc9eb3baf8d859897da17.tar.gz
syslinux-4561fc3586957f5d745bc9eb3baf8d859897da17.tar.xz
syslinux-4561fc3586957f5d745bc9eb3baf8d859897da17.zip
Fixed the various Makefiles so that SYSLINUX compiles on platforms with GCC -fstack-protector flag enabled by default.
Diffstat (limited to 'sample')
-rw-r--r--sample/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/sample/Makefile b/sample/Makefile
index cf0d3f19..d2a00f9b 100644
--- a/sample/Makefile
+++ b/sample/Makefile
@@ -16,12 +16,13 @@
TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
+CC = gcc
+
gcc_ok = $(shell tmpf=$(TMPFILE); if $(CC) $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \
then echo $(1); else echo $(2); fi; rm -f $$tmpf)
M32 := $(call gcc_ok,-m32,) $(call gcc_ok,-ffreestanding,) $(call gcc_ok,-fno-stack-protector,)
-CC = gcc
LD = ld -m elf_i386
AR = ar
NASM = nasm