Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit3159040

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

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package Mkvcbuild;
33
#
44
# Package that generates build files for msvc build
55
#
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 $
77
#
88
use Carp;
99
use Win32;
@@ -398,8 +398,10 @@ sub AddContrib
398398
$mf =~s{\\\s*[\r\n]+}{}mg;
399399
my$proj =$solution->AddProject($dn,'dll','contrib');
400400
$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)
402403
{
404+
my$o =$1;
403405
$o =~s/\.o$/.c/;
404406
$proj->AddFile('contrib\\' .$n .'\\' .$o);
405407
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp