Bug 415422: Fix gqi dep build (crash on startup). r=ted, a=damons
git-svn-id: svn://10.0.0.236/trunk@245199 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
9c38414a2c
commit
00a8e500a5
@ -54,11 +54,9 @@ my $silent = $ENV{MAKEFLAGS} =~ /^\w*s|\s-s/;
|
||||
%alldeps={};
|
||||
# Parse dependency files
|
||||
while ($line = <>) {
|
||||
chomp $line;
|
||||
# Remove extra ^M caused by using dos-mode line-endings
|
||||
chop $line if (substr($line, -1, 1) eq "\r");
|
||||
$line =~ s/\r?\n$//; # Handle both unix and DOS line endings
|
||||
($obj,$rest) = split /\s*:\s+/, $line, 2;
|
||||
next if $obj eq '';
|
||||
next if $obj eq '' || $rest eq '';
|
||||
|
||||
if ($line =~ /\\$/) {
|
||||
chop $rest;
|
||||
@ -70,7 +68,7 @@ while ($line = <>) {
|
||||
print "add $obj $rest\n" if $debug;
|
||||
|
||||
while ($hasSlash and $line = <>) {
|
||||
chomp $line;
|
||||
$line =~ s/\r?\n$//; # Handle both unix and DOS line endings
|
||||
if ($line =~ /\\$/) {
|
||||
chop $line;
|
||||
} else {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user