Commit 4b623d80f7352 added an .obj file (invalidcontinue.obj) which was not
processed correctly.
The generate engine then mistakenly did a s/.o/.c/ to create a request
to compile invalidcontinue.cbj.
Split the '/\.(o|obj)$' in engine.pl#L353 into:
} elsif ($part =~ /\.o$/) { # was '/\.(o|obj)$'
push(@objfiles, $part);
} elsif ($part =~ /\.obj$/) { # was '/\.(o|obj)$'
# push(@objfiles, $part); # do nothing
} else {
And correct the substitution to only operate on .o files.
Also report all errors rather than dieing on the first
$ git describe 4b623d80f7352
v1.9.1-1-g4b623d8
The problem exists for V1.9.2 onward
Signed-off-by: Philip Oakley <[email protected]>
---
contrib/buildsystems/engine.pl | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index 8e41808..16c3dd5 100755
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -264,7 +264,9 @@ sub handleCompileLine
} elsif ($part =~ /\.(c|cc|cpp)$/) {
$sourcefile = $part;
} else {
- die "Unhandled compiler option @ line $lineno: $part";
+ print "full line: $line\n";
+ print "A:-Unhandled compiler option @ line $lineno: $part\n"; #
die (if !DEBUG)
+# die "Unhandled compiler option @ line $lineno: $part";
}
}
@{$compile_options{"${sourcefile}_CFLAGS"}} = @cflags;
@@ -290,14 +292,15 @@ sub handleLibLine
$libout = $part;
$libout =~ s/\.a$//;
} else {
- die "Unhandled lib option @ line $lineno: $part";
+ print "A:-Unhandled lib option @ line $lineno: $part\n"; # die (if
!DEBUG)
+# die "Unhandled lib option @ line $lineno: $part";
}
}
# print "LibOut: '$libout'\nLFlags: @lflags\nOfiles: @objfiles\n";
# exit(1);
foreach (@objfiles) {
my $sourcefile = $_;
- $sourcefile =~ s/\.o/.c/;
+ $sourcefile =~ s/\.o$/.c/;
push(@sources, $sourcefile);
push(@cflags, @{$compile_options{"${sourcefile}_CFLAGS"}});
push(@defines, @{$compile_options{"${sourcefile}_DEFINES"}});
@@ -343,8 +346,10 @@ sub handleLinkLine
} elsif ($part =~ /\.(a|lib)$/) {
$part =~ s/\.a$/.lib/;
push(@libs, $part);
- } elsif ($part =~ /\.(o|obj)$/) {
+ } elsif ($part =~ /\.o$/) { # was '/\.(o|obj)$'
push(@objfiles, $part);
+ } elsif ($part =~ /\.obj$/) { # was '/\.(o|obj)$'
+ # push(@objfiles, $part); # do nothing
} else {
die "Unhandled lib option @ line $lineno: $part";
}
@@ -353,7 +358,7 @@ sub handleLinkLine
# exit(1);
foreach (@objfiles) {
my $sourcefile = $_;
- $sourcefile =~ s/\.o/.c/;
+ $sourcefile =~ s/\.o$/.c/;
push(@sources, $sourcefile);
push(@cflags, @{$compile_options{"${sourcefile}_CFLAGS"}});
push(@defines, @{$compile_options{"${sourcefile}_DEFINES"}});
--
1.9.4.msysgit.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
