Use one makefile for fixinc

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38231 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 12 insertions, 21 deletions

diff --git a/gcc/fixinc/mkfixinc.sh b/gcc/fixinc/mkfixinc.sh
index ec9cdbcb985..5bb6a5502c9 100755
--- a/gcc/fixinc/mkfixinc.sh
+++ b/gcc/fixinc/mkfixinc.sh
@@ -1,39 +1,30 @@
 #! /bin/sh
 
-build=$1
-machine=$2
-
-if [ -z "$build" ]
-then
-	echo No target system name given
-	exit 1
-fi
-
-#  If we don't get two arguments, then assume both arguments
-#  are the same
-#
-if [ -z "$machine" ]
+if [ $# -ne 2 ]
 then
-	machine="$build"
+  echo "Usage: $0 <build-mach-triplet> <target-mach-triplet>"
+  exit 1
 fi
 
+build=$1
+machine=$2
 target=../fixinc.sh
 
 echo constructing ${target} for $machine to run on $build
 fixincludes="${machine}"
 
-# Choose fix build method by build system
+# Choose one or two-process fix methodology.  Systems that cannot handle
+# bi-directional pipes must use the twoprocess method.
+#
 case $build in
-	i?86-*-msdosdjgpp* )
-		MAKE="${MAKE} -f ${srcdir}/Makefile.DOS srcdir=${srcdir}"
-		;;
-
+	i?86-*-msdosdjgpp* | \
 	*-*-beos* )
-		MAKE="${MAKE} -f ${srcdir}/Makefile.BEOS srcdir=${srcdir}"
+		MAKE="${MAKE} TARGETS=twoprocess"
+		CFLAGS="${CFLAGS} -DSEPARATE_FIX_PROC"
 		;;
 
 	* )
-		MAKE="${MAKE} -f Makefile"
+		MAKE="${MAKE} TARGETS=oneprocess"
 		;;
 esac