diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-05-28 09:23:57 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-28 09:23:57 -0700 |
| commit | 80001b1d2acc06b33bb6de05474ce54682dacfb6 (patch) | |
| tree | a320dc9767a953d435ef9d3c951ebd2d97acf4dd /com32/modules/Makefile | |
| parent | 6699cb66d4456f2d61b3ac3f8d14ce81df2437eb (diff) | |
| parent | 1bd7c31844a7b946c5d2d85a21e913fa81460930 (diff) | |
| download | syslinux-80001b1d2acc06b33bb6de05474ce54682dacfb6.tar.gz | |
Merge commit 'origin/master' into gpxe-added
Conflicts:
NEWS
version
Diffstat (limited to 'com32/modules/Makefile')
| -rw-r--r-- | com32/modules/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/modules/Makefile b/com32/modules/Makefile index ff42a348..9890228f 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 |