From 3b85d9de443c31e49a0215c1fe3c80828d609062 Mon Sep 17 00:00:00 2001 From: "Keith W. Campbell" Date: Wed, 13 Apr 2022 18:14:33 -0400 Subject: [PATCH] Add quotes around perl scripts Otherwise, it seems nmake doesn't invoke perl properly. Signed-off-by: Keith W. Campbell Reviewed-by: Matt Caswell Reviewed-by: Richard Levitte Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/18215) --- Configurations/windows-makefile.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 2167180e14..a195bd596f 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -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 } } -- 2.39.5