From c04b8819161de007cee831dd9e58dde52268da18 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 25 Jul 2022 08:07:33 +0200 Subject: [PATCH] Configurations/10-main.conf: In the VC-common target, unquote $(CC) Some of the VC-common attributes have values that use `$(CC)`, wrapped with quotes. However, `Configurations/windows-makefile.tmpl` already quotes the `CC` value, like this: CC="{- $config{CC} -}" The interaction between that makefile variable and the attributes using `$(CC)` wrapped with quotes is a command line with the quotes doubled. For example, the value of `$(CPP)` becomes `""cl""`. Strangely enough, this appears to be tolerated, at least on some versions of Windows. However, this has been reported not to be the case. This is fixed by removing the quotes in `Configurations/10-main.conf`, making `Configurations/windows-makefile.tmpl` responsible for proper quoting. Fixes #18823 Reviewed-by: Hugo Landau Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/18861) --- Configurations/10-main.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index c824f4ed4a0..73ace78bc41 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1309,7 +1309,7 @@ my %targets = ( inherit_from => [ "BASE_Windows" ], template => 1, CC => "cl", - CPP => '"$(CC)" /EP /C', + CPP => '$(CC) /EP /C', CFLAGS => "/W3 /wd4090 /nologo", coutflag => "/Fo", LD => "link", @@ -1318,7 +1318,7 @@ my %targets = ( ldpostoutflag => "", ld_resp_delim => "\n", bin_lflags => "setargv.obj", - makedepcmd => '"$(CC)" /Zs /showIncludes', + makedepcmd => '$(CC) /Zs /showIncludes', makedep_scheme => 'VC', AR => "lib", ARFLAGS => "/nologo",