On 18/04/2008, Tom Tromey <[EMAIL PROTECTED]> wrote:
> >>>>> "Mark" == Mark Wielaard <[EMAIL PROTECTED]> writes:
>
> Mark> At this point $vm_dirlist is ../vm/reference and $1 is standard, but
> Mark> there is no ../vm/reference/standard.omit file, so $vm_omitlist will
> Mark> stay empty leading to the empty cat | sed.
>
> Thanks for tracking this down. And, sorry about the mess.
> Here's the patch I'm committing. This fixed it for me.
>
> Tom
>
> ChangeLog:
> 2008-04-18 Tom Tromey <[EMAIL PROTECTED]>
>
> * lib/gen-classlist.sh.in: Skip 'sed' steps if no vm_omitlist
> found.
>
> Index: lib/gen-classlist.sh.in
> ===================================================================
> RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
> retrieving revision 1.41
> diff -u -r1.41 gen-classlist.sh.in
> --- lib/gen-classlist.sh.in 17 Apr 2008 22:46:20 -0000 1.41
> +++ lib/gen-classlist.sh.in 18 Apr 2008 14:29:43 -0000
> @@ -119,8 +119,10 @@
>
> vm_omitlist="$vm_omitlist $dir/$1.omit"
> fi
> done
>
> -cat $vm_omitlist | sed "$sed_omit_hash" > tmp.awk
> -cat $vm_omitlist | sed "$sed_omit_main_loop" >> tmp.awk
>
> +if test -n "$vm_omitlist"; then
> + cat $vm_omitlist | sed "$sed_omit_hash" > tmp.awk
>
> + cat $vm_omitlist | sed "$sed_omit_main_loop" >> tmp.awk
>
> +fi
> @AWK@ -f tmp.awk < vm.add >>${top_builddir}/lib/classes.1
>
> rm -f vm.omit vm.add tmp.omit tmp.awk
>
>
Works for me too. Thanks.
--
Andrew :-)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
