Sun Oct 5 23:04:00 2008 UTC ()

fix a 2 year old fix that broke genmultilib.  ${CONFIG_SHELL}
wasn't expanded inside cat >tmpmultilib<<\EOF due to the \.
use two cat's to generate these files now, one with EOF and
one with \EOF.


(mrg)

diff -r1.2 -r1.3 src/gnu/dist/gcc4/gcc/genmultilib

--- src/gnu/dist/gcc4/gcc/Attic/genmultilib 2006/09/29 20:11:07	1.2
+++ src/gnu/dist/gcc4/gcc/Attic/genmultilib 2008/10/05 23:04:00	1.3

 @@ -126,28 +126,30 @@ enable_multilib=$8
 echo "static const char *const multilib_raw[] = {"
 mkdir tmpmultilib.$$ || exit 1
 # Use cd ./foo to avoid CDPATH output.
 cd ./tmpmultilib.$$ || exit 1
 # What we want to do is select all combinations of the sets in
 # options.  Each combination which includes a set of mutually
 # exclusive options must then be output multiple times, once for each
 # item in the set.  Selecting combinations is a recursive process.
 # Since not all versions of sh support functions, we achieve recursion
 # by creating a temporary shell script which invokes itself.
 rm -f tmpmultilib
-cat >tmpmultilib <<\EOF
+cat >tmpmultilib <<EOF
 #!${CONFIG_SHELL:-/bin/sh}
 EOF
 cat >>tmpmultilib <<\EOF
 # This recursive script basically outputs all combinations of its
 # input arguments, handling mutually exclusive sets of options by
 # repetition.  When the script is called, ${initial} is the list of
 # options which should appear before all combinations this will
 # output.  The output looks like a list of subdirectory names with
 # leading and trailing slashes.
 if [ "$#" != "0" ]; then
   first=$1
   shift
   case "$first" in
   *\|*)
     all=${initial}`echo $first | sed -e 's_|_/_'g`
     first=`echo $first | sed -e 's_|_ _'g`
 @@ -162,28 +164,30 @@ if [ "$#" != "0" ]; then
     ./tmpmultilib $@
     for opt in `echo $first | sed -e 's|/| |'g`; do
       initial="${initial}${opt}/" ./tmpmultilib $@
     done
   esac
 fi
 EOF
 chmod +x tmpmultilib
 combinations=`initial=/ ./tmpmultilib ${options}`
 # If there exceptions, weed them out now
 if [ -n "${exceptions}" ]; then
-  cat >tmpmultilib2 <<\EOF
+  cat >tmpmultilib2 <<EOF
 #!${CONFIG_SHELL:-/bin/sh}
 EOF
   cat >>tmpmultilib2 <<\EOF
 # This recursive script weeds out any combination of multilib
 # switches that should not be generated.  The output looks like
 # a list of subdirectory names with leading and trailing slashes.
   for opt in $@; do
     case "$opt" in
 EOF
   for except in ${exceptions}; do
     echo "      /${except}/) : ;;" >> tmpmultilib2
   done
 cat >>tmpmultilib2 <<\EOF
 @@ -261,28 +265,30 @@ if [ -n "${osdirnames}" ]; then
   fi
 fi
 # We need another recursive shell script to correctly handle positive
 # matches.  If we are invoked as
 #   genmultilib "opt1 opt2" "" "opt1=nopt1 opt2=nopt2"
 # we must output
 #   opt1/opt2 opt1 opt2
 #   opt1/opt2 nopt1 opt2
 #   opt1/opt2 opt1 nopt2
 #   opt1/opt2 nopt1 nopt2
 # In other words, we must output all combinations of matches.
 rm -f tmpmultilib2
-cat >tmpmultilib2 <<\EOF
+cat >tmpmultilib2 <<EOF
 #!${CONFIG_SHELL:-/bin/sh}
 EOF
 cat >>tmpmultilib2 <<\EOF
 # The positional parameters are a list of matches to consider.
 # ${dirout} is the directory name and ${optout} is the current list of
 # options.
 if [ "$#" = "0" ]; then
   echo "\"${dirout} ${optout};\","
 else
   first=$1
   shift
   dirout="${dirout}" optout="${optout}" ./tmpmultilib2 $@
   l=`echo ${first} | sed -e 's/=.*$//' -e 's/?/=/g'`
   r=`echo ${first} | sed -e 's/^.*=//' -e 's/?/=/g'`
   if expr " ${optout} " : ".* ${l} .*" > /dev/null; then
     newopt=`echo " ${optout} " | sed -e "s/ ${l} / ${r} /" -e 's/^ //' -e 's/ $//'`