Add quotes around perl scripts
authorKeith W. Campbell <keithc@ca.ibm.com>
Wed, 13 Apr 2022 22:14:33 +0000 (18:14 -0400)
committerTomas Mraz <tomas@openssl.org>
Wed, 11 May 2022 13:14:23 +0000 (15:14 +0200)
Otherwise, it seems nmake doesn't invoke perl properly.

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18215)

(cherry picked from commit 3b85d9de443c31e49a0215c1fe3c80828d609062)

Configurations/windows-makefile.tmpl

index 2167180e144a8389f03bc64df0f9aeb0abf973c6..a195bd596f77160420a667151aac90045df368de 100644 (file)
@@ -744,7 +744,7 @@ EOF
               $args{generator}->[1] || platform->dsoname($args{product});
           return <<"EOF";
 $target: $gen0 $deps $mkdef
-       "\$(PERL)" $mkdef$ord_ver --ordinals $gen0 --name $ord_name --OS windows > $target
+       "\$(PERL)" "$mkdef"$ord_ver --ordinals $gen0 --name $ord_name --OS windows > $target
 EOF
       } elsif (platform->isasm($args{src})) {
           #
@@ -760,7 +760,7 @@ EOF
 
           my $generator;
           if ($gen0 =~ /\.pl$/) {
-              $generator = '"$(PERL)"'.$gen_incs.' '.$gen0.$gen_args
+              $generator = '"$(PERL)"'.$gen_incs.' "'.$gen0.'"'.$gen_args
                   .' "$(PERLASM_SCHEME)"'.$incs.' '.$cppflags.$defs.' $(PROCESSSOR)';
           } elsif ($gen0 =~ /\.S$/) {
               $generator = undef;
@@ -817,7 +817,7 @@ EOF
           $gen0 = platform->bin($gen0);
           return <<"EOF";
 $args{src}: $gen0 $deps "\$(BLDDIR)\\util\\wrap.pl"
-       "\$(PERL)" "\$(BLDDIR)\\util\\wrap.pl" $gen0$gen_args > \$@
+       "\$(PERL)" "\$(BLDDIR)\\util\\wrap.pl" "$gen0"$gen_args > \$@
 EOF
       } else {
           #
@@ -825,7 +825,7 @@ EOF
           #
           return <<"EOF";
 $args{src}: "$gen0" $deps
-       "\$(PERL)"$gen_incs $gen0$gen_args > \$@
+       "\$(PERL)"$gen_incs "$gen0"$gen_args > \$@
 EOF
       }
   }