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 | |
| 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)
| -rw-r--r-- | Configurations/00-base-templates.conf | 2 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 14 |
2 files changed, 8 insertions, 8 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 ]; }, diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 49da7869f4..e9179a4477 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -207,10 +207,10 @@ CNF_ASFLAGS={- join(' ', $target{asflags} || (), @{$config{asflags}}) -} CNF_CPPFLAGS={- our $cppfags2 = join(' ', $target{cppflags} || (), - (map { quotify_l("-D".$_) } @{$target{defines}}, - @{$config{defines}}), - (map { quotify_l("-I".$_) } @{$target{includes}}, - @{$config{includes}}), + (map { '-D'.quotify1($_) } @{$target{defines}}, + @{$config{defines}}), + (map { '-I'.quotify1($_) } @{$target{includes}}, + @{$config{includes}}), @{$config{cppflags}}) -} CNF_CFLAGS={- join(' ', $target{cflags} || (), @{$config{cflags}}) -} @@ -233,12 +233,12 @@ LIB_ASFLAGS={- join(' ', $target{lib_asflags} || (), LIB_CPPFLAGS={- our $lib_cppflags = join(' ', $target{lib_cppflags} || (), $target{shared_cppflag} || (), - (map { quotify_l("-D".$_) } + (map { '-D'.quotify1($_) } @{$target{lib_defines}}, @{$target{shared_defines}}, @{$config{lib_defines}}, @{$config{shared_defines}}), - (map { quotify_l("-I".$_) } + (map { '-I'.quotify1($_) } @{$target{lib_includes}}, @{$target{shared_includes}}, @{$config{lib_includes}}, @@ -246,7 +246,7 @@ LIB_CPPFLAGS={- our $lib_cppflags = @{$config{lib_cppflags}}, @{$config{shared_cppflag}}); join(' ', $lib_cppflags, - (map { quotify_l("-D".$_) } + (map { '-D'.quotify1($_) } "OPENSSLDIR=\"$openssldir\"", "ENGINESDIR=\"$enginesdir\""), '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -} |