From: Kyotaro Horiguchi Date: Tue, 18 Feb 2020 15:29:55 +0900 Subject: [PATCH v2] Fix behavior for repeated build on Windows. Even after the function GenerateConfigHeader in Solution.pm decided not to generate a new file, it wrongly checks for the remaining macro defintions and stops with failure. Fix it by not doing the check if it skipped file generation. --- src/tools/msvc/Solution.pm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 75f916399c..6b4a6eec2a 100644 --- 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); + } } } -- 2.18.2 ----Next_Part(Tue_Feb_25_10_14_10_2020_215)----