From fcdb106c23a7d0c5f37306897b87264fe9f09593 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 10 Aug 2008 21:37:51 +0000 Subject: Handle multiple-line dependencies in Makefile.extra --- infrastructure/makebuildenv.pl.in | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in index 52e90b50..c65a4140 100755 --- a/infrastructure/makebuildenv.pl.in +++ b/infrastructure/makebuildenv.pl.in @@ -922,11 +922,18 @@ sub additional_objects_from_make_fragment chomp; if(m/link-extra:\s*(.+)\Z/) { - my @o = split /\s+/,$1; - for(@o) + my $extra = $1; + do { - push @$objs_r,$1 if m/\A(.+)\.o\Z/; + my @o = split /\s+/, $extra; + for(@o) + { + push @$objs_r,$1 if m/\A(.+)\.o\Z/; + } + last unless $extra =~ m'\\$'; + $extra = ; } + while(1); } elsif(m/include-makefile:\s*(\S+)/) { -- cgit v1.2.3