Check for the compiler's availability early in the `make' run, in

Make.config, and give a warning that points to the documentation if we
can't find it.
Also, modify other Makefiles so that Make.config is only included
once, so that the message is only printed once.

diff --git a/src/Make.config b/src/Make.config
index 0a1b46a37ac10de3cf7e37c1670eafff5464b33e..910ef121099486fc8dc0377a4f70523f6f128343 100644 (file)
--- a/src/Make.config
+++ b/src/Make.config
@@ -18,6 +18,10 @@ LD = i386-elf-ld
 OBJCOPY = i386-elf-objcopy
 endif
 
+ifeq ($(strip $(shell command -v $(CC) 2> /dev/null)),)
+$(warning *** Compiler ($(CC)) not found.  Did you set $$PATH properly?  Please refer to the Getting Started section in the documentation for details. ***)
+endif
+
 # Compiler and assembler invocation.
 DEFINES =
 WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers

diff --git a/src/Makefile.userprog b/src/Makefile.userprog
index 72e35ce7ee92a285e4d1b6562318247bda427754..870aae4b95f56bae532e8ab075c2e503d4ce4b71 100644 (file)
--- a/src/Makefile.userprog
+++ b/src/Makefile.userprog
@@ -1,7 +1,5 @@
 # -*- makefile -*-
 
-include $(SRCDIR)/Make.config
-
 $(PROGS): CPPFLAGS += -I$(SRCDIR)/lib/user -I.
 
 # Linker flags.

diff --git a/src/examples/Makefile b/src/examples/Makefile
index a7bba67f446006568563243cb80a959445a4953c..e15f824f4aa2766ed9d0d5719958502e8ef69eed 100644 (file)
--- a/src/examples/Makefile
+++ b/src/examples/Makefile
@@ -24,4 +24,5 @@ lineup_SRC = lineup.c
 matmult_SRC = matmult.c
 recursor_SRC = recursor.c
 
+include $(SRCDIR)/Make.config
 include $(SRCDIR)/Makefile.userprog