Skip to content

Commit a2826ff

Browse files
committed
Update MSVC build process for new timezone data.
Missed this dependency in commits 7cce222 et al.
1 parent d46f691 commit a2826ff

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/tools/msvc/Install.pm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,8 @@ sub GenerateTimezoneFiles
316316
my $mf = read_file("src/timezone/Makefile");
317317
$mf =~ s{\\\s*[\r\n]+}{}mg;
318318

319-
$mf =~ /^TZDATA\s*:?=\s*(.*)$/m
320-
|| die "Could not find TZDATA line in timezone makefile\n";
319+
$mf =~ /^TZDATAFILES\s*:?=\s*(.*)$/m
320+
|| die "Could not find TZDATAFILES line in timezone makefile\n";
321321
my @tzfiles = split /\s+/, $1;
322322

323323
$mf =~ /^POSIXRULES\s*:?=\s*(.*)$/m
@@ -332,7 +332,8 @@ sub GenerateTimezoneFiles
332332
foreach (@tzfiles)
333333
{
334334
my $tzfile = $_;
335-
push(@args, "src/timezone/data/$tzfile")
335+
$tzfile =~ s|\$\(srcdir\)|src/timezone|;
336+
push(@args, $tzfile);
336337
}
337338

338339
system(@args);

0 commit comments

Comments
 (0)