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/unix-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/unix-Makefile.tmpl')
-rw-r--r-- | Configurations/unix-Makefile.tmpl | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index fc483f0ff9..8230676a5d 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -254,15 +254,18 @@ CNF_EX_LIBS={- join(' ', $target{ex_libs} || (), # Variables starting with BIN_ are used to build programs and their object # files. -LIB_CPPFLAGS={- join(' ', $target{lib_cppflags} || (), +LIB_CPPFLAGS={- our $lib_cppflags = + join(' ', $target{lib_cppflags} || (), $target{shared_cppflag} || (), (map { '-D'.$_ } @{$config{lib_defines}}, - @{$config{shared_defines}}, + @{$config{shared_defines}}), + @{$config{lib_cppflags}}, + @{$config{shared_cppflag}}); + join(' ', $lib_cppflags, + (map { '-D'.$_ } 'OPENSSLDIR="\"$(OPENSSLDIR)\""', 'ENGINESDIR="\"$(ENGINESDIR)\""'), - @{$config{lib_cppflags}}, - @{$config{shared_cppflag}}, '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -} LIB_CFLAGS={- join(' ', $target{lib_cflags} || (), $target{shared_cflag} || (), @@ -316,7 +319,9 @@ 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 || ()) -} + $lib_cppflags =~ s|([\\"])|\\$1|g; + join(' ', $lib_cppflags || (), $cppflags2 || (), + $cppflags1 || ()) -} PERLASM_SCHEME= {- $target{perlasm_scheme} -} |