Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7b0cb5e

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

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
@@ -381,8 +381,8 @@ sub GenerateTimezoneFiles
381381
my $mf = read_file("src/timezone/Makefile");
382382
$mf =~ s{\\\r?\n}{}g;
383383

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

388388
$mf =~ /^POSIXRULES\s*:?=\s*(.*)$/m
@@ -397,7 +397,8 @@ sub GenerateTimezoneFiles
397397
foreach (@tzfiles)
398398
{
399399
my $tzfile = $_;
400-
push(@args, "src/timezone/data/$tzfile");
400+
$tzfile =~ s|\$\(srcdir\)|src/timezone|;
401+
push(@args, $tzfile);
401402
}
402403

403404
system(@args);

0 commit comments

Comments
 (0)