aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Conway <neilc@samurai.com>2006-11-21 17:54:26 +0000
committerNeil Conway <neilc@samurai.com>2006-11-21 17:54:26 +0000
commit66eda1c7b3abc17c7a53730614761628e89dcdd3 (patch)
tree4641a310ea8306e4cc9bd8055b729b23a112f6de
parentae81a6329d12a15fd9546247d2ff492aa5b7571d (diff)
downloadpostgresql-66eda1c7b3abc17c7a53730614761628e89dcdd3.tar.gz
postgresql-66eda1c7b3abc17c7a53730614761628e89dcdd3.zip
VC build patch from Magnus:
Typo in the changes to plperl - uses wrong dir, and had a missing slash. Also fixes error checking for xsubpp - it was broken in a way that hid the problem above when run more than once (which is the normal case when developing).
-rw-r--r--src/tools/msvc/mkvcbuild.pl7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tools/msvc/mkvcbuild.pl b/src/tools/msvc/mkvcbuild.pl
index ec3e326ac52..421629db525 100644
--- a/src/tools/msvc/mkvcbuild.pl
+++ b/src/tools/msvc/mkvcbuild.pl
@@ -52,8 +52,11 @@ if ($solution->{options}->{perl}) {
$plperl->AddDefine('PLPERL_HAVE_UID_GID');
if (Solution::IsNewer('src\pl\plperl\SPI.c','src\pl\plperl\SPI.xs')) {
print 'Building src\pl\plperl\SPI.c...' . "\n";
- system($solution->{options}->{perl} . '/bin/perl ' . $solution->{options}->{perl} . '/lib/COREExtUtils/xsubpp -typemap ' . $solution->{options}->{perl} . '/lib/CORE/ExtUtils/typemap src\pl\plperl\SPI.xs >src\pl\plperl\SPI.c');
- die 'Failed to create SPI.c' . "\n" if ((!(-f 'src\pl\plperl\SPI.c')) || -z 'src\pl\plperl\SPI.c');
+ system($solution->{options}->{perl} . '/bin/perl ' . $solution->{options}->{perl} . '/lib/ExtUtils/xsubpp -typemap ' . $solution->{options}->{perl} . '/lib/ExtUtils/typemap src\pl\plperl\SPI.xs >src\pl\plperl\SPI.c');
+ if ((!(-f 'src\pl\plperl\SPI.c')) || -z 'src\pl\plperl\SPI.c') {
+ unlink('src\pl\plperl\SPI.c'); # if zero size
+ die 'Failed to create SPI.c' . "\n";
+ }
}
$plperl->AddReference($postgres);
$plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');