Revert 1.25 and 1.26: Breaks build on !NetBSD

This commit is contained in:
joerg 2013-03-14 14:55:35 +00:00
parent 2c1464a536
commit 8f7ae0d2ba
1 changed files with 3 additions and 14 deletions

View File

@ -1,6 +1,6 @@
#!@BSHELL@ -
#
# $NetBSD: host-mkdep.in,v 1.26 2013/03/12 01:55:33 christos Exp $
# $NetBSD: host-mkdep.in,v 1.27 2013/03/14 14:55:35 joerg Exp $
#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
@ -69,12 +69,6 @@ set_objlist()
fi
}
# Send the command output to 4, and a command to set the exit code to 5
run_cmd() {
"$@" 1>&4 4>&-
echo rv=$? 1>&5 5>&-
}
# A getopt compatible command line parser in shell comands.
# (don't trust the shell builtin getopts to be in a known state on error)
while [ $# -gt 0 ]; do
@ -232,13 +226,12 @@ if $MERGE; then
done <$f
done >$TMP
else
exec 5>&1
for f in $SRCS; do
file=${f##*/}
file=${file%.*}
set_objlist $file
eval $( (run_cmd @CPP@ "$@" $f 4>&1 | @AWK@ '
@CPP@ "$@" $f | @AWK@ '
/^#/ {
# Be as tolerant as possible.
sub(/^#(line)? [ 0-9]*\"?/, "")
@ -254,11 +247,7 @@ else
print "'"$objlist"'" ": " $0
'"$AWK_OPTIONAL"'
}
' >> $TMP) 5>&1)
case "$rv" in
0);;
*) exit $rv;;
esac
' >> $TMP
done
fi