Tue Jan 7 01:55:14 UTC 2020 Chad Elliott <[email protected]>

Author: ocielliottc

ChangeLog

@@ -1,3 +1,11 @@
+Tue Jan  7 01:55:14 UTC 2020  Chad Elliott  <[email protected]>
+
+        * modules/ProjectCreator.pm:
+
+          Do not make a copy of the flag overrides hash when the files are
+          part of the same component group.  We make the copy later on when
+          we are modifying the overrides for tied files.
+
 Mon Jan  6 06:21:29 UTC 2020  Chad Elliott  <[email protected]>
 
         * modules/ProjectCreator.pm:

modules/ProjectCreator.pm

@@ -1429,12 +1429,9 @@ sub process_component_line {
       my $over = $self->{'flag_overrides'}->{$tag};
       if (defined $over) {
         foreach my $file (@files) {
-          ## We are giving these flag overrides to multiple files.  Since
-          ## $flags is a hash reference, we need to make a copy so that
-          ## modifying one of these files flag overrides doesn't modify
-          ## all of them.
-          my %copy = %$flags;
-          $$over{$file} = \%copy;
+          ## We are giving these flag overrides to multiple files.  We must
+          ## do so because these files are all in the same group.
+          $$over{$file} = $flags;
         }
       }
 
@@ -3849,6 +3846,10 @@ sub generate_defaults {
                             $file, $self->{'valid_components'}->{$gentype});
           my($tied, $vc) = $cmdHelper->get_tied($file, \@files);
           foreach my $tie (@$tied) {
+            ## We have a tied file, now we need to actually perform
+            ## the tieing of the two.  We will do this by saying that
+            ## the output of the original is necessary for the
+            ## processing of the tied file.
             my @gen;
             if (!defined $vc) {
               foreach $vc (@vc) {
@@ -3857,11 +3858,6 @@ sub generate_defaults {
                 last if ($#gen >= 0);
               }
             }
-
-            ## We have a tied file, now we need to actually perform
-            ## the tieing of the two.  We will do this by saying that
-            ## the output of the original is necessary for the
-            ## processing of the tied file.
             @gen = $self->generated_filenames($part, $gentype,
                                               $vc, $file) if (!$gen[0]);
 
@@ -3870,13 +3866,35 @@ sub generate_defaults {
             ## ($gentype), so we just add the first one and
             ## we're done.
             my $first = $gen[0];
-            $self->{'flag_overrides'}->{$gentype}->{$tie}->{$dep} =
-              $self->{'generated_exts'}->{$gentype}->{$dep}
-              if (!defined $self->{'flag_overrides'}->{$gentype}->{$tie}->{$dep});
+            my $needcopy = 1;
+            if (!defined $self->{'flag_overrides'}->{$gentype}->{$tie}->{$dep}) {
+              ## We are about to modify the flag overrides for a tied file.
+              ## We need to make a copy so that we do not affect the
+              ## overrides of grouped, but no longer affiliated files.
+              my %copy = %{$self->{'flag_overrides'}->{$gentype}->{$tie}};
+              $self->{'flag_overrides'}->{$gentype}->{$tie} = \%copy;
+              $needcopy = undef;
+
+              ## Start a new dependent setting based on the original
+              ## custom build settings.
+              $self->{'flag_overrides'}->{$gentype}->{$tie}->{$dep} =
+                $self->{'generated_exts'}->{$gentype}->{$dep};
+            }
 
-            $self->{'flag_overrides'}->{$gentype}->{$tie}->{$dep} .= " $first"
             if (!defined $self->{'flag_overrides'}->{$gentype}->{$tie}->{$dep} ||
-                $self->{'flag_overrides'}->{$gentype}->{$tie}->{$dep} !~ /\b$first\b/);
+                $self->{'flag_overrides'}->{$gentype}->{$tie}->{$dep} !~ /\b$first\b/) {
+              if ($needcopy) {
+                ## We are about to modify the flag overrides for a tied file.
+                ## We need to make a copy so that we do not affect the
+                ## overrides of grouped, but no longer affiliated files.
+                my %copy = %{$self->{'flag_overrides'}->{$gentype}->{$tie}};
+                $self->{'flag_overrides'}->{$gentype}->{$tie} = \%copy;
+                $needcopy = undef;
+              }
+
+              ## Update the dependent value for this tied file.
+              $self->{'flag_overrides'}->{$gentype}->{$tie}->{$dep} .= " $first";
+            }
           }
         }
       }