Use $(CC) in gcc_ok macro, not plain gcc

Use $(CC) in gcc_ok macro, not plain gcc.  This seems to work, iff the
gcc_ok macro is declared with =, not :=

diff --git a/Makefile b/Makefile
index 49bb5ec..cde7db0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ MAKEFLAGS = -r
 
 TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
 
-gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) dummy.c -o $$tmpf 2>/dev/null; \
+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)
 
 comma   := ,

diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile
index 45e2160..5514f8b 100644 (file)
--- a/com32/libutil/Makefile
+++ b/com32/libutil/Makefile
@@ -31,7 +31,7 @@
 
 TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
 
-gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \
+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,)

diff --git a/com32/modules/Makefile b/com32/modules/Makefile
index 4849d1c..8a127e6 100644 (file)
--- a/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@ -16,7 +16,7 @@
 
 TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
 
-gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \
+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,)

diff --git a/com32/samples/Makefile b/com32/samples/Makefile
index 177f351..2c2406f 100644 (file)
--- a/com32/samples/Makefile
+++ b/com32/samples/Makefile
@@ -16,7 +16,7 @@
 
 TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
 
-gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \
+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,)
@@ -49,7 +49,7 @@ all:  hello.c32 cat.c32 resolv.c32 vesainfo.c32 serialinfo.c32 \
        localboot.c32 \
        fancyhello.c32 fancyhello.lnx \
        keytest.c32 keytest.lnx \
-       advdump.c32
+       advdump.c32 readpit.c32
 
 .PRECIOUS: %.o
 %.o: %.S

diff --git a/dos/Makefile b/dos/Makefile
index ad202ee..4f344f4 100644 (file)
--- a/dos/Makefile
+++ b/dos/Makefile
@@ -1,6 +1,6 @@
 TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
 
-gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \
+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,) \

diff --git a/extlinux/Makefile b/extlinux/Makefile
index 908d1ce..9dd7ec9 100644 (file)
--- a/extlinux/Makefile
+++ b/extlinux/Makefile
@@ -1,6 +1,6 @@
 TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
 
-gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) ../dummy.c -o $$tmpf 2>/dev/null; \
+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)
 
 comma   := ,

diff --git a/mbr/Makefile b/mbr/Makefile
index a64869b..6a1bcb7 100644 (file)
--- a/mbr/Makefile
+++ b/mbr/Makefile
@@ -16,7 +16,7 @@
 
 TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
 
-gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \
+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)

diff --git a/memdisk/Makefile b/memdisk/Makefile
index e90c72c..d9cc7f9 100644 (file)
--- a/memdisk/Makefile
+++ b/memdisk/Makefile
@@ -14,7 +14,7 @@ VERSION := $(shell cat ../version)
 
 TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
 
-gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \
+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,)

diff --git a/memdump/Makefile b/memdump/Makefile
index 4049702..585381d 100644 (file)
--- a/memdump/Makefile
+++ b/memdump/Makefile
@@ -1,6 +1,6 @@
 TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
 
-gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \
+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,)

diff --git a/menu/Makefile b/menu/Makefile
index 512f61a..58c0e2f 100644 (file)
--- a/menu/Makefile
+++ b/menu/Makefile
@@ -16,7 +16,7 @@
 
 TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
 
-gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \
+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,)

diff --git a/mtools/Makefile b/mtools/Makefile
index 4b52cb6..7175bb3 100644 (file)
--- a/mtools/Makefile
+++ b/mtools/Makefile
@@ -1,6 +1,6 @@
 TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
 
-gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) ../dummy.c -o $$tmpf 2>/dev/null; \
+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)
 
 comma   := ,

diff --git a/sample/Makefile b/sample/Makefile
index bd64e90..3ed7907 100644 (file)
--- a/sample/Makefile
+++ b/sample/Makefile
@@ -16,7 +16,7 @@
 
 TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
 
-gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) -c -x c /dev/null -o $$tmpf 2>/dev/null; \
+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,)

diff --git a/unix/Makefile b/unix/Makefile
index 75f7cba..8d92d3a 100644 (file)
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -1,6 +1,6 @@
 TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX)
 
-gcc_ok   = $(shell tmpf=$(TMPFILE); if gcc $(1) ../dummy.c -o $$tmpf 2>/dev/null; \
+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)
 
 comma   := ,