-# Utilities.
-# On a system where i386-elf is native (e.g. on an x86 GNU/Linux
-# machine) you want to set BINUTIL_PREFIX to expand to null, as shown
-# in the line that's commented out.
-BINUTIL_PREFIX = i386-elf-
-#BINUTIL_PREFIX =
-CC = $(BINUTIL_PREFIX)gcc
-LD = $(BINUTIL_PREFIX)ld
-OBJCOPY = $(BINUTIL_PREFIX)objcopy
+# Binary utilities.
+# If the host appears to be x86, use the normal tools.
+# Otherwise assume cross-tools are installed as i386-elf-*.
+X86 = i.86\|pentium.*\|[pk][56]\|nexgen\|viac3\|6x86\|athlon.*
+ifneq (0, $(shell expr `uname -m` : '$(X86)'))
+CC = gcc
+LD = ld
+OBJCOPY = objcopy
+else
+CC = i386-elf-gcc
+LD = i386-elf-ld
+OBJCOPY = i386-elf-objcopy
+endif
+
+# Other utilities.
+DD = dd
+RM = rm
+CAT = cat