diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-01-04 06:39:50 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-01-07 11:58:17 +0100 |
| commit | d368d9d2e4bce444b3c56db55aab5f8450814209 (patch) | |
| tree | 0d63e636c828843ffe5fc8eb27b30539fee310e8 /Configurations | |
| parent | 88b4c61299c565d1349247c955dd67a4177b55dd (diff) | |
Configuration: synchronise the variables on the build file templates
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)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/00-base-templates.conf | 2 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 14 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 98200af7f7..451a808f1e 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -10,7 +10,7 @@ my %targets=( includes => [], lib_cflags => "", lib_cppflags => "", - lib_defines => [], + lib_defines => [ 'OPENSSL_BUILDING_OPENSSL' ], thread_scheme => "(unknown)", # Assume we don't know thread_defines => [], diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index b1c087272d..0edde3f599 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -332,8 +332,15 @@ LIB_CPPFLAGS={- our $lib_cppflags = join(' ', $target{lib_cppflags} || (), $target{shared_cppflag} || (), (map { '-D'.$_ } + @{$target{lib_defines} || ()}, + @{$target{shared_defines} || ()}, @{$config{lib_defines} || ()}, @{$config{shared_defines} || ()}), + (map { '-I'.quotify1($_) } + @{$target{lib_includes}}, + @{$target{shared_includes}}, + @{$config{lib_includes}}, + @{$config{shared_includes}}), @{$config{lib_cppflags}}, @{$config{shared_cppflag}}); join(' ', $lib_cppflags, @@ -359,8 +366,15 @@ LIB_EX_LIBS=$(CNF_EX_LIBS) $(EX_LIBS) DSO_CPPFLAGS={- join(' ', $target{dso_cppflags} || (), $target{module_cppflags} || (), (map { '-D'.$_ } + @{$target{dso_defines}}, + @{$target{module_defines}}, @{$config{dso_defines} || ()}, @{$config{module_defines} || ()}), + (map { '-I'.quotify1($_) } + @{$target{dso_includes}}, + @{$target{module_includes}}, + @{$config{dso_includes}}, + @{$config{module_includes}}), @{$config{dso_cppflags}}, @{$config{module_cppflags}}, '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -} diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 8e0d098e20..cc19b31255 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -334,6 +334,7 @@ BIN_ASFLAGS={- join(' ', $target{bin_asflags} || (), @{$config{bin_asflags}}, '$(CNF_ASFLAGS)', '$(ASFLAGS)') -} BIN_CPPFLAGS={- join(' ', $target{bin_cppflags} || (), + (map { '-D'.$_ } @{$config{bin_defines} || ()}), @{$config{bin_cppflags}}, '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -} BIN_CFLAGS={- join(' ', $target{bin_cflags} || (), |