diff options
author | Chris Wilson <chris+github@qwirx.com> | 2008-08-10 21:37:51 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2008-08-10 21:37:51 +0000 |
commit | fcdb106c23a7d0c5f37306897b87264fe9f09593 (patch) | |
tree | 366a4111cacc3d7b703e547f402359967a9467cd /infrastructure | |
parent | 687c7eba4efd9b734ad8802e174c874a302ae0b3 (diff) |
Handle multiple-line dependencies in Makefile.extra
Diffstat (limited to 'infrastructure')
-rwxr-xr-x | infrastructure/makebuildenv.pl.in | 13 |
1 files 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 = <FL>; } + while(1); } elsif(m/include-makefile:\s*(\S+)/) { |