diff options
author | Richard Levitte <levitte@openssl.org> | 2018-04-01 17:41:16 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-04-01 22:39:18 +0200 |
commit | 2cc8fe11add1b21f3f30cbcf365bb8d8da4fd2b4 (patch) | |
tree | 9da280a3417248800bb1065604a26f137dc94ad3 /Configurations/00-base-templates.conf | |
parent | 2a70d65b99e1f2376be705d18bca88703b7e774a (diff) |
Windows builds: remove over-quotation of LIBZ macro
The LIBZ macro definition was already quoted in BASE_windows, then got
quotified once more in windows-makefile.tmpl. That's a bit too much
quotations, ending up with the compiler being asked to define the
macro |"LIBZ=\"ZLIB1\""| (no, not the macro LIBZ with the value
"ZLIB1"). This is solved by removing the extra quoting in
BASE_windows.
Along with this, change the quotation of macro definitions and include
file specification, so we end up with things like -I"QuotedPath" and
-D"Macro=\"some weird value\"" rather than "-IQuotedPath" and
"-DMacro=\"some weird value\"".
Fixes #5827
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5833)
Diffstat (limited to 'Configurations/00-base-templates.conf')
-rw-r--r-- | Configurations/00-base-templates.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index c074bd6e21..edcc454fd2 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -114,7 +114,7 @@ my %targets=( my @defs = (); unless ($disabled{"zlib-dynamic"}) { my $zlib = $withargs{zlib_lib} // "ZLIB1"; - push @defs, quotify("perl", 'LIBZ="' . $zlib . '"'); + push @defs, 'LIBZ=' . (quotify("perl", $zlib))[0]; } return [ @defs ]; }, |