diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 156e975bc..654ee8859 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2002-01-21 Christopher Faylor + + * cygmagic: Attempt to figure out if sum takes an option. + 2002-01-21 DJ Delorie * Makefile.in (libpthread.a): Pass the assembler also. diff --git a/winsup/cygwin/cygmagic b/winsup/cygwin/cygmagic index 87e571d9c..16053624d 100755 --- a/winsup/cygwin/cygmagic +++ b/winsup/cygwin/cygmagic @@ -17,10 +17,16 @@ cat < $file_magic /* autogenerated - do not edit */ #include "$file" EOF +if sum -r /dev/null; then + sumit(){ sum -r $*; } +else + sumit(){ sum $*; } +fi + while [ -n "$1" ]; do define=$1; shift struct=$1; shift - sum=`$gcc -E $file | sed -n "/^$struct/,/^};/p" | sed -e 's/[ ]//g' -e '/^$/d' | sum | awk '{printf "0x%x", $1}'` + sum=`$gcc -E $file | sed -n "/^$struct/,/^};/p" | sed -e 's/[ ]//g' -e '/^$/d' | sumit | awk '{printf "0x%x", $1}'` echo "#define $define $sum" curr=`sed -n "s/^#[ ]*define CURR_$define[ ][ ]*\([^ ][^ ]*\)/\1/p" $file` [ "$curr" != "$sum" ] && echo "*** WARNING WARNING WARNING WARNING WARNING ***