From 34b3298baa2e3cd3d35ac1a6b195ad445d11bf84 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Thu, 18 Mar 1993 01:08:58 +0000
Subject: [PATCH] A new ARG_MAX hack.  Use unexport to keep GNU make from
 dumping the CHILL variables in the environment, with a : variable to keep
 older makes happy.

---
 ChangeLog   |  3 ---
 Makefile.in | 19 +++++++------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 27d108c..fa7562a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,6 @@ Mon Mar 15 15:44:35 1993  Ian Lance Taylor  (ian@cygnus.com)
 
 	* configure.in (h8300-*-*, h8500-*-*): Don't build libg++.
 
-	* Makefile.in (GCC_FLAGS_TO_PASS): Reset some variables that gcc
-	doesn't use to avoid ARG_MAX overflow on SCO.
-
 Fri Mar 12 18:30:14 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* configure.in: canonicalize all instances to *-*-solaris2*,
diff --git a/Makefile.in b/Makefile.in
index afd3800..a923015 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,6 +117,12 @@ CHILL_FOR_TARGET = ` \
       t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
     fi; \
   fi`
+
+## This is ugly, but I don't want GNU make to put these variables in
+## the environment.  Older makes will see this as a set of targets
+## with no dependencies and no actions.
+unexport CHILLFLAGS CHILL_LIB CHILL_FOR_TARGET :
+
 $(end-sanitize-chill)
 
 CXX_FOR_TARGET = ` \
@@ -280,17 +286,7 @@ EXTRA_GCC_FLAGS = \
 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
 	'XTRAFLAGS='
 
-# On SCO 3.2v4, the gcc build can fill the environment.  Resetting
-# some variables solves the problem.
-GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) \
-	$(EXTRA_GCC_FLAGS) \
-$(start-sanitize-chill)\
-	"CHILLFLAGS=" \
-	"CHILL_FOR_TARGET=" \
-	"CHILL_LIB=" \
-$(end-sanitize-chill)\
-	"CXX_FOR_TARGET=" \
-	"XTRAFLAGS_FOR_TARGET="
+GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
 
 # The first rule in the file had better be this one.  Don't put any above it.
 all:	$(ALL)
@@ -806,7 +802,6 @@ install-chillrt: force
 		true ; \
 	fi
 
-all-gdb: all-chillrt
 ### end-sanitize-chill
 
 ### gprof
-- 
2.7.4