Skip to content

Commit 1601a94

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

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
@@ -343,8 +343,8 @@ sub GenerateTimezoneFiles
343343
my $mf = read_file("src/timezone/Makefile");
344344
$mf =~ s{\\\s*[\r\n]+}{}mg;
345345

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

350350
$mf =~ /^POSIXRULES\s*:?=\s*(.*)$/m
@@ -359,7 +359,8 @@ sub GenerateTimezoneFiles
359359
foreach (@tzfiles)
360360
{
361361
my $tzfile = $_;
362-
push(@args, "src/timezone/data/$tzfile")
362+
$tzfile =~ s|\$\(srcdir\)|src/timezone|;
363+
push(@args, $tzfile);
363364
}
364365

365366
system(@args);

0 commit comments

Comments
 (0)