public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Configuration: synchronise the variables on the build file templates

Browse source 
For some reason, we didn't use some of the possible target attributes
in the Unix Makefile template, and there was a similar but much
smaller lack of use in the Windows makefile template as well.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10753)
This commit is contained in:
Richard Levitte 2020-01-04 06:39:50 +01:00
parent 88b4c61299
commit d368d9d2e4
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Configurations/00-base-templates.conf
View file

@ -10,7 +10,7 @@ my %targets=(
includes => [], includes => [],
lib_cflags => "", lib_cflags => "",
lib_cppflags => "", lib_cppflags => "",
lib_defines => [], lib_defines => [ 'OPENSSL_BUILDING_OPENSSL' ],
thread_scheme => "(unknown)", # Assume we don't know thread_scheme => "(unknown)", # Assume we don't know
thread_defines => [], thread_defines => [],

14
Configurations/unix-Makefile.tmpl
View file

@ -332,8 +332,15 @@ LIB_CPPFLAGS={- our $lib_cppflags =
join(' ', $target{lib_cppflags} || (), join(' ', $target{lib_cppflags} || (),
$target{shared_cppflag} || (), $target{shared_cppflag} || (),
(map { '-D'.$_ } (map { '-D'.$_ }
@{$target{lib_defines} || ()},
@{$target{shared_defines} || ()},
@{$config{lib_defines} || ()}, @{$config{lib_defines} || ()},
@{$config{shared_defines} || ()}), @{$config{shared_defines} || ()}),
(map { '-I'.quotify1($_) }
@{$target{lib_includes}},
@{$target{shared_includes}},
@{$config{lib_includes}},
@{$config{shared_includes}}),
@{$config{lib_cppflags}}, @{$config{lib_cppflags}},
@{$config{shared_cppflag}}); @{$config{shared_cppflag}});
join(' ', $lib_cppflags, join(' ', $lib_cppflags,
@ -359,8 +366,15 @@ LIB_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS)
DSO_CPPFLAGS={- join(' ', $target{dso_cppflags} || (), DSO_CPPFLAGS={- join(' ', $target{dso_cppflags} || (),
$target{module_cppflags} || (), $target{module_cppflags} || (),
(map { '-D'.$_ } (map { '-D'.$_ }
@{$target{dso_defines}},
@{$target{module_defines}},
@{$config{dso_defines} || ()}, @{$config{dso_defines} || ()},
@{$config{module_defines} || ()}), @{$config{module_defines} || ()}),
(map { '-I'.quotify1($_) }
@{$target{dso_includes}},
@{$target{module_includes}},
@{$config{dso_includes}},
@{$config{module_includes}}),
@{$config{dso_cppflags}}, @{$config{dso_cppflags}},
@{$config{module_cppflags}}, @{$config{module_cppflags}},
'$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -} '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -}

1
Configurations/windows-makefile.tmpl
View file

@ -334,6 +334,7 @@ BIN_ASFLAGS={- join(' ', $target{bin_asflags} || (),
@{$config{bin_asflags}}, @{$config{bin_asflags}},
'$(CNF_ASFLAGS)', '$(ASFLAGS)') -} '$(CNF_ASFLAGS)', '$(ASFLAGS)') -}
BIN_CPPFLAGS={- join(' ', $target{bin_cppflags} || (), BIN_CPPFLAGS={- join(' ', $target{bin_cppflags} || (),
(map { '-D'.$_ } @{$config{bin_defines} || ()}),
@{$config{bin_cppflags}}, @{$config{bin_cppflags}},
'$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -} '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -}
BIN_CFLAGS={- join(' ', $target{bin_cflags} || (), BIN_CFLAGS={- join(' ', $target{bin_cflags} || (),