diff options
author | Stefan Bucur <stefanb@zytor.com> | 2008-05-12 21:47:23 +0300 |
---|---|---|
committer | Stefan Bucur <stefanb@zytor.com> | 2008-05-12 21:47:23 +0300 |
commit | 4561fc3586957f5d745bc9eb3baf8d859897da17 (patch) | |
tree | 1789353f8744b40090c74f5ebb924ef0079fb23a /com32 | |
parent | e31a673cc14223db120f363dcd6ecc491125f622 (diff) | |
download | syslinux-4561fc3586957f5d745bc9eb3baf8d859897da17.tar.gz |
Fixed the various Makefiles so that SYSLINUX compiles on platforms with GCC -fstack-protector flag enabled by default.
Diffstat (limited to 'com32')
-rw-r--r-- | com32/lib/MCONFIG | 2 | ||||
-rw-r--r-- | com32/libutil/Makefile | 2 | ||||
-rw-r--r-- | com32/menu/Makefile | 2 | ||||
-rw-r--r-- | com32/modules/Makefile | 2 | ||||
-rw-r--r-- | com32/samples/Makefile | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/com32/lib/MCONFIG b/com32/lib/MCONFIG index e9b29412..2e36597b 100644 --- a/com32/lib/MCONFIG +++ b/com32/lib/MCONFIG @@ -1,13 +1,13 @@ # -*- makefile -*- 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) GCCOPT := $(call gcc_ok,-m32,) $(call gcc_ok,-fno-stack-protector,) -CC = gcc LD = ld INCLUDE = -I. AR = ar diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile index 5514f8b6..01de06a3 100644 --- a/com32/libutil/Makefile +++ b/com32/libutil/Makefile @@ -30,13 +30,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 diff --git a/com32/menu/Makefile b/com32/menu/Makefile index 4e0abc55..8d7b69f4 100644 --- a/com32/menu/Makefile +++ b/com32/menu/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 diff --git a/com32/modules/Makefile b/com32/modules/Makefile index 690183ec..f7f12f09 100644 --- a/com32/modules/Makefile +++ b/com32/modules/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 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 |