diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-03-09 12:39:01 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-03-09 14:07:59 +0100 |
| commit | 58d6be5b5de7c46e0c67438bc11d96e717578386 (patch) | |
| tree | f1a28da8c91d969b84f69824ecca29d7bae81d23 /Configurations/windows-makefile.tmpl | |
| parent | 68b8bcf49c84b74e3d5560c50113e879f872d21a (diff) | |
Display the library building flags
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5560)
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 83f893d6a8..214619ad1c 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -230,22 +230,25 @@ CNF_EX_LIBS={- join(' ', $target{ex_libs} || (), LIB_ASFLAGS={- join(' ', $target{lib_asflags} || (), @{$config{lib_asflags}}, '$(CNF_ASFLAGS)', '$(ASFLAGS)') -} -LIB_CPPFLAGS={- join(' ', $target{lib_cppflags} || (), +LIB_CPPFLAGS={- our $lib_cppflags = + join(' ', $target{lib_cppflags} || (), $target{shared_cppflag} || (), (map { quotify_l("-D".$_) } @{$target{lib_defines}}, @{$target{shared_defines}}, @{$config{lib_defines}}, - @{$config{shared_defines}}, - "OPENSSLDIR=\"$openssldir\"", - "ENGINESDIR=\"$enginesdir\""), + @{$config{shared_defines}}), (map { quotify_l("-I".$_) } @{$target{lib_includes}}, @{$target{shared_includes}}, @{$config{lib_includes}}, @{$config{shared_includes}}), @{$config{lib_cppflags}}, - @{$config{shared_cppflag}}, + @{$config{shared_cppflag}}); + join(' ', $lib_cppflags, + (map { quotify_l("-D".$_) } + "OPENSSLDIR=\"$openssldir\"", + "ENGINESDIR=\"$enginesdir\""), '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -} LIB_CFLAGS={- join(' ', $target{lib_cflags} || (), $target{shared_cflag} || (), @@ -294,7 +297,8 @@ BIN_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS) # CPPFLAGS_Q is used for one thing only: to build up buildinf.h CPPFLAGS_Q={- $cppflags1 =~ s|([\\"])|\\$1|g; $cppflags2 =~ s|([\\"])|\\$1|g; - join(' ', $cppflags1 || (), $cppflags2 || ()) -} + join(' ', $lib_cppflags || (), $cppflags2 || (), + $cppflags1 || ()) -} PERLASM_SCHEME= {- $target{perlasm_scheme} -} |