Commit3159040

committed

Improve logic for finding object files on OBJS lines in contrib Makefiles. If this unbreaks buildfarm mastodon, apply everywhere.

1 parent6b1b464 commit3159040Copy full SHA for 3159040

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Mkvcbuild;`
`3`	`3`	`#`
`4`	`4`	`# Package that generates build files for msvc build`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.27 2008/04/16 14:19:56 adunstan Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.28 2008/05/09 16:01:05 adunstan Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use Win32;`
`@@ -398,8 +398,10 @@ sub AddContrib`
`398`	`398`	`$mf =~s{\\\s*[\r\n]+}{}mg;`
`399`	`399`	`my$proj =$solution->AddProject($dn,'dll','contrib');`
`400`	`400`	`$mf =~/^OBJS\s=\s(.*)$/gm \|\| croak"Could not find objects in MODULE_big for$n\n";`
`401`		`-foreachmy$o (split /\s+/,$1)`
	`401`	`+my$objs =$1;`
	`402`	`+while ($objs =~/\b([\w-]+\.o)\b/g)`
`402`	`403`	`{`
	`404`	`+my$o =$1;`
`403`	`405`	`$o =~s/\.o$/.c/;`
`404`	`406`	`$proj->AddFile('contrib\\' .$n .'\\' .$o);`
`405`	`407`	`}`

Comments

(0)