Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tools/host-mkdep Revert 1.25 and 1.26: Breaks build on !NetBSD



details:   https://anonhg.NetBSD.org/src/rev/a6e333a6034a
branches:  trunk
changeset: 785453:a6e333a6034a
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Mar 14 14:55:35 2013 +0000

description:
Revert 1.25 and 1.26: Breaks build on !NetBSD

diffstat:

 tools/host-mkdep/host-mkdep.in |  17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diffs (52 lines):

diff -r e93262b2b775 -r a6e333a6034a tools/host-mkdep/host-mkdep.in
--- a/tools/host-mkdep/host-mkdep.in    Thu Mar 14 13:08:56 2013 +0000
+++ b/tools/host-mkdep/host-mkdep.in    Thu Mar 14 14:55:35 2013 +0000
@@ -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 @@
        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 @@
                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 @@
                                print "'"$objlist"'" ": " $0
                                '"$AWK_OPTIONAL"'
                        }
-               ' >> $TMP) 5>&1)
-               case "$rv" in
-               0);;
-               *)      exit $rv;;
-               esac
+               ' >> $TMP
        done
 fi
 



Home | Main Index | Thread Index | Old Index