* Makefile.in (GCC_FOR_TARGET): Supply a default that matches

	the one used in gcc/Makefile.in, so that a null expansion doesn't
	override the one needed to build gcc with a native cc.

2 files changed, 50 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index f62d3b6..3b7a25d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Wed Jan  6 11:02:10 1993  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in (GCC_FOR_TARGET):  Supply a default that matches
+	the one used in gcc/Makefile.in, so that a null expansion doesn't
+	override the one needed to build gcc with a native cc.
+
+	**** start-sanitize-chill ****
+Wed Jan  6 07:53:46 1993  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in (SUBDIRS):  Add chillrt.
+	* Makefile.in (all.normal):  Add all-chillrt.
+	* Makefile.in (all.cross):  Add all-chillrt.
+	* Makefile.in (install-no-fixedincludes):  Add install-chillrt.
+	* Makefile.in (install.cross):  Add install-chillrt.
+	* Makefile.in (all-chillrt, install-chillrt):  New targets.
+	* Makefile.in (subdir_do):  Handle chillrt like newlib.
+	* configure.in (target_libs):  Add chillrt.
+	**** end-sanitize-chill ****
+
 Tue Jan  5 07:55:12 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
 
 	* configure: Accept -with arguments.
diff --git a/Makefile.in b/Makefile.in
index 44359ac..cee8d2b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,6 +56,7 @@ CC = cc
 CFLAGS = -g
 CXX = gcc
 CXXFLAGS = -g -O
+GCC_FOR_TARGET = ./gcc -B./
 RANLIB = ranlib
 NM = nm
 
@@ -77,7 +78,7 @@ MAKEINFO = `if [ -f $${rootme}/texinfo/C/makeinfo ] ; \
 CC_FOR_BUILD = $(CC)
 CXX_FOR_BUILD = $(CXX)
 
-SUBDIRS = libiberty mmalloc glob readline opcodes bfd h8300sim z8ksim gdb binutils ld gas tgas gcc libg++ newlib deja-gnu
+SUBDIRS = libiberty mmalloc glob readline opcodes bfd h8300sim z8ksim gdb binutils ld gas tgas gcc libg++ newlib chillrt deja-gnu
 OTHERS = 
 
 ALL = all.normal
@@ -199,7 +200,7 @@ X11_FLAGS_TO_PASS = \
 	"X11_LIB_FLAGS=$(X11_LIB_FLAGS)"
 
 # Flags to pass down to makes which are built with the target
-# environment (e.g. libg++, xiberty, newlib).  -- keep these in alpha order please
+# environment (e.g. libg++, xiberty, newlib, chillrt).  -- keep these in alpha order please
 TARGET_FLAGS_TO_PASS = \
 	"AR=$(AR_FOR_TARGET)" \
 	"AR_FLAGS=$(AR_FLAGS)" \
@@ -254,14 +255,14 @@ all.normal: all-m4 all-autoconf all-libiberty all-mmalloc all-texinfo \
 	all-make all-rcs all-cvs all-diff all-grep \
 	all-patch all-emacs all-ispell all-etc \
 	all-tcl all-tk all-expect \
-	all-newlib all-gprof all-send_pr all-libm all-deja-gnu \
+	all-newlib all-chillrt all-gprof all-send_pr all-libm all-deja-gnu \
 	all-fileutils all-find all-gawk all-sed all-shellutils \
 	all-textutils all-time all-wdiff
 
 
 all.cross: all-libiberty all-mmalloc all-gas all-byacc all-flex all-ld \
 	 all-opcodes all-z8ksim all-h8300sim all-bfd all-readline all-gdb all-binutils all-gcc \
-	all-newlib all-deja-gnu
+	all-newlib all-chillrt all-deja-gnu
 
 .PHONY: clean distclean mostlyclean realclean do_clean
 
@@ -320,6 +321,7 @@ install-no-fixedincludes: install-dirs gcc-no-fixedincludes \
 	install-make \
 	install-mmalloc \
 	install-newlib \
+	install-chillrt \
 	install-patch \
 	install-rcs \
 	install-readline \
@@ -346,7 +348,7 @@ install.cross: install-dirs install-libiberty install-mmalloc \
         install-binutils install-opcodes install-byacc install-flex \
         install-ld install-gas install-readline \
         install-glob install-gdb install-mmalloc \
-        install-newlib install-gcc install-etc install-deja-gnu
+        install-newlib install-chillrt install-gcc install-etc install-deja-gnu
 
 ### deja-gnu
 all-deja-gnu: force
@@ -556,6 +558,29 @@ install-newlib: force
 		true ; \
 	fi
 
+### start-sanitize-chill
+### chillrt
+all-chillrt: all-binutils all-ld all-gas all-gcc
+	@if [ -f ./chillrt/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
+		(cd ./chillrt; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) all) ; \
+	else \
+		true ; \
+	fi
+
+install-chillrt: force
+	@if [ -f ./chillrt/Makefile ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
+		(cd ./chillrt; \
+		$(MAKE) $(TARGET_FLAGS_TO_PASS) install) ; \
+	else \
+		true ; \
+	fi
+### end-sanitize-chill
+
 ### gprof
 all-gprof: all-libiberty all-bfd
 	@if [ -f ./gprof/Makefile ] ; then \
@@ -1214,7 +1239,7 @@ subdir_do:
 	@for i in $(DODIRS); do \
 	  if [ -f ./$$i/localenv ] || [ -f ./$$i/Makefile ] ; then \
 	    case $$i in \
-	    libg++ | xiberty | newlib) \
+	    libg++ | xiberty | newlib | chillrt) \
 	      if (rootme=`pwd` ; export rootme ; \
 		  srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
 		  cd ./$$i ; \