Fix build failure on header generation with repetitive builds of MSVC

michaelpq · michaelpq · commit 59f9cd9dd5e4 · 2020-02-25T13:57:40.000+09:00
GenerateConfigHeader() in Solution.pm was complaining about unused define symbols even if a newer config header was not generated, causing successive build attempts with MSVC to fail. Oversight in commit 8f4fb4c. Author: Kyotaro Horiguchi Reviewed-by: Juan José Santamaría Flecha Discussion: https://postgr.es/m/20200218.160500.44393633318853097.horikyota.ntt@gmail.com
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -826,13 +826,14 @@ EOF
 sub GenerateConfigHeader
 {
 	my ($self, $config_header, $defines, $required) = @_;
-	my %defines_copy = %$defines;
 
 	my $config_header_in = $config_header . '.in';
 
 	if (IsNewer($config_header, $config_header_in) ||
 		IsNewer($config_header, __FILE__))
 	{
+		my %defines_copy = %$defines;
+
 		open(my $i, '<', $config_header_in)
 		  || confess "Could not open $config_header_in\n";
 		open(my $o, '>', $config_header)
@@ -871,10 +872,11 @@ sub GenerateConfigHeader
 		}
 		close($o);
 		close($i);
-	}
-	if ($required && scalar(keys %defines_copy) > 0)
-	{
-		croak "unused defines: " . join(' ', keys %defines_copy);
+
+		if ($required && scalar(keys %defines_copy) > 0)
+		{
+			croak "unused defines: " . join(' ', keys %defines_copy);
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -826,13 +826,14 @@ EOF`
`826`	`826`	`sub GenerateConfigHeader`
`827`	`827`	`{`
`828`	`828`	`my ($self, $config_header, $defines, $required) = @_;`
`829`		`- my %defines_copy = %$defines;`
`830`	`829`
`831`	`830`	`my $config_header_in = $config_header . '.in';`
`832`	`831`
`833`	`832`	`if (IsNewer($config_header, $config_header_in) \|\|`
`834`	`833`	`IsNewer($config_header, __FILE__))`
`835`	`834`	`{`
	`835`	`+ my %defines_copy = %$defines;`
	`836`	`+`
`836`	`837`	`open(my $i, '<', $config_header_in)`
`837`	`838`	`\|\| confess "Could not open $config_header_in\n";`
`838`	`839`	`open(my $o, '>', $config_header)`
`@@ -871,10 +872,11 @@ sub GenerateConfigHeader`
`871`	`872`	`}`
`872`	`873`	`close($o);`
`873`	`874`	`close($i);`
`874`		`- }`
`875`		`- if ($required && scalar(keys %defines_copy) > 0)`
`876`		`- {`
`877`		`- croak "unused defines: " . join(' ', keys %defines_copy);`
	`875`	`+`
	`876`	`+ if ($required && scalar(keys %defines_copy) > 0)`
	`877`	`+ {`
	`878`	`+ croak "unused defines: " . join(' ', keys %defines_copy);`
	`879`	`+ }`
`878`	`880`	`}`
`879`	`881`	`}`
`880`	`882`