aboutsummaryrefslogtreecommitdiffstats
path: root/com32/samples
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 /com32/samples
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 'com32/samples')
-rw-r--r--com32/samples/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/samples/Makefile b/com32/samples/Makefile
index 189dc187..77feb58c 100644
--- a/com32/samples/Makefile
+++ b/com32/samples/Makefile
@@ -15,13 +15,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,-fno-stack-protector,)
-CC = gcc
LD = ld -m elf_i386
AR = ar
NASM = nasm