aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2006-09-08 21:58:35 +0000
committerlloyd <[email protected]>2006-09-08 21:58:35 +0000
commit0bd8c8b21ab12059297bce66e6ca7d8118458ffb (patch)
treef8b50dd50710b28a5606732bda0ea792ee50c2f3
parent8a9cf332c58ff9e6e083c6081d2e967128025ad5 (diff)
Fix a bug when generating nmake-style makefiles.
Make sure to close the output file in process_template Work around some Visual Studio command-line brain damange.
-rwxr-xr-xconfigure.pl5
-rw-r--r--misc/config/cc/msvc2
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.pl b/configure.pl
index b97dcde8e..7850af497 100755
--- a/configure.pl
+++ b/configure.pl
@@ -844,6 +844,7 @@ sub process_template {
open OUT, ">$out" or croak("Couldn't write $out ($!)");
print OUT $contents;
+ close OUT;
}
##################################################
@@ -1560,8 +1561,6 @@ sub generate_makefile {
'link_to' => libs('', '.'.$$config{'static_suffix'},
@{$$config{'mod_libs'}}),
});
-
- process_template($$config{'makefile'}, 'Makefile', $config);
}
trace("mapped type '$make_style' to template '$template'");
@@ -1627,7 +1626,7 @@ sub build_cmds {
die unless defined($inc) and defined($from) and defined($to);
my $bld_line =
- "\t\$(CXX) $inc$inc_dir $flags $from \$? $to \$@";
+ "\t\$(CXX) $inc$inc_dir $flags $from\$? $to\$@";
foreach (sort keys %$files) {
my $src_file = File::Spec->catfile($$files{$_}, $_);
diff --git a/misc/config/cc/msvc b/misc/config/cc/msvc
index 29270270b..3f444a9c3 100644
--- a/misc/config/cc/msvc
+++ b/misc/config/cc/msvc
@@ -2,7 +2,7 @@ realname "Visual C++ 2000/2003"
binary_name "cl /nologo"
-compile_option "/c"
+compile_option "/c "
output_to_option "/Fo"
add_include_dir_option "/I"
add_lib_dir_option "-L"