Use config args to control optimization flags

Currently two settings, one for core, one for cpan.

Author: shawnlaffan

lib/Perl/Dist/Strawberry/Step/InstallPerlCore.pm

@@ -112,6 +112,11 @@ sub run {
   my $u64 = defined $self->global->{perl_64bitint} ? $self->global->{perl_64bitint} : ($self->{config}->{perl_64bitint} // $self->{config}->{use_64_bit_int} // 0);
   # XXX use_64_bit_int is for backwards compatibility
 
+  #  Optionally override the default optimization settings.
+  #  This hack is needed as some perls need -Os to build but then modules need -O2.  
+  my $optimize_core = $self->global->{optimize_core} // $self->{config}->{optimize_core};
+  my $optimize_cpan = $self->global->{optimize_cpan} // $self->{config}->{optimize_cpan};
+  
   # Build win32 perl
   SCOPE: {
     my $wd = $self->_push_dir( $unpack_to, $perlsrc, 'win32' );
@@ -160,6 +165,10 @@ sub run {
       $new_env->{PROCESSOR_ARCHITECTURE} = 'x86';
       push @make_args, 'WIN64=undef';
     }
+    if ($optimize_core) {
+        push @make_args, "OPTIMIZE=${optimize_core}";
+        $self->boss->message(3, "Building core using OPTIMIZE=${optimize_core}");
+    }
 
     my $maketool = $self->global->{maketool} || 'dmake';
     #create debuging build scripts in 'win32' subdir
@@ -256,8 +265,7 @@ sub run {
 
   die "FATAL: perl.exe not properly installed" unless -f catfile($image_dir, qw/perl bin perl.exe/);
 
-  do {
-      #  could shell out to 'perl -i'?
+  if ($optimize_cpan) {
       my $config_heavy = catfile($image_dir, qw/perl lib Config_heavy.pl/);
       if (-e $config_heavy) {  #  it should always be there
           $self->boss->message(3, "Updating optimize settings in Config_heavy.pl");
@@ -269,7 +277,7 @@ sub run {
           my $data = <$fh>;
           $fh->close;
           #  now update the file
-          $data =~ s/^(optimize=.+)$/optimize='-O2'/m;
+          $data =~ s/^optimize=(.+)$/optimize='$optimize_cpan'/m;
           my $ro_flag = $self->_unset_ro($config_heavy);
           open my $ofh, '>', $config_heavy or die "Unable to open $config_heavy for writing, $?";
           print {$ofh} $data;