From e85e07cb85907df7d4142ce680b13eea59cf70b1 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Wed, 16 Dec 1992 18:27:07 +0000
Subject: [PATCH] Wed Dec 16 10:25:31 1992  Ian Lance Taylor  (ian@cygnus.com)

	* Makefile.in: Add lines defining CC and CXX, and use CXX rather
	than gcc in definitions of CXX_FOR_BUILD and CXX_FOR_TARGET.
---
 ChangeLog   | 14 ++++++++++++++
 Makefile.in | 14 ++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e7853a6..7b79bda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Wed Dec 16 10:25:31 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: Add lines defining CC and CXX, and use CXX rather
+	than gcc in definitions of CXX_FOR_BUILD and CXX_FOR_TARGET.
+
+Tue Dec 15 00:34:32 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: change all $(host_cpu)-$(host_vendor)-$(host_os) to
+	$(host_canonical).
+
+	* configure.in: split the configdirs list into 4 categories (native
+	v. cross, library v. tool) and handle the cross-only and native-
+	only in more reasonable (and correct!) way.  
+
 Mon Dec 14 17:04:22 1992  Stu Grossman  (grossman at cygnus.com)
 
 	* configure.in (hppa*-*-*):  Don't remove bfd and gdb from
diff --git a/Makefile.in b/Makefile.in
index d9f4cd4..0e6fab4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,7 +52,9 @@ INSTALL_DATA = $(INSTALL)
 AS = as
 AR = ar
 AR_FLAGS = rc
+CC = cc
 CFLAGS = -g
+CXX = gcc
 CXXFLAGS = -g -O
 RANLIB = ranlib
 NM = nm
@@ -70,10 +72,10 @@ MAKEINFO = `if [ -f $${rootme}/texinfo/C/makeinfo ] ; \
 	then echo $${rootme}/texinfo/C/makeinfo ; \
 	else echo makeinfo ; fi`
 
-# C compiler to use to create programs which must be run in the build
+# compilers to use to create programs which must be run in the build
 # environment.
 CC_FOR_BUILD = $(CC)
-CXX_FOR_BUILD = gcc
+CXX_FOR_BUILD = $(CXX)
 
 SUBDIRS = libiberty mmalloc glob readline opcodes bfd z8ksim gdb binutils ld gas tgas gcc libg++ newlib deja-gnu
 OTHERS = 
@@ -99,8 +101,8 @@ CXX_FOR_TARGET = ` \
   if [ -f $${rootme}/gcc/Makefile ] ; then \
     echo $${rootme}/gcc/gcc -B$${rootme}/gcc/; \
   else \
-    if [ "$(host_cpu)-$(host_vendor)-$(host_os)" = "$(target_cpu)-$(target_vendor)-$(target_os)" ] ; then \
-      echo gcc; \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+      echo $(CXX); \
     else \
       t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
     fi; \
@@ -110,7 +112,7 @@ AS_FOR_TARGET = ` \
   if [ -f $${rootme}/gas/Makefile ] ; then \
     echo $${rootme}/gas/as.new ; \
   else \
-    if [ "$(host_cpu)-$(host_vendor)-$(host_os)" = "$(target_cpu)-$(target_vendor)-$(target_os)" ] ; then \
+    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(AS); \
     else \
        t='$(program_transform_name)'; echo as | sed -e '' $$t ; \
@@ -917,7 +919,7 @@ install-libm: force
 
 ### libg++
 
-all-libg++: all-gas all-ld all-gcc all-xiberty
+all-libg++: all-gas all-ld all-gcc all-xiberty all-newlib
 	@if [ -f ./libg++/Makefile ] ; then \
 		rootme=`pwd` ; export rootme ; \
 		srcroot=`cd $(srcdir); pwd` ; export srcroot ; \
-- 
2.7.4