diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-04-26 09:17:05 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-04-28 21:35:26 +0200 |
| commit | 2e535eb50aa9c6b73c796f668e1aef8bc17f14c4 (patch) | |
| tree | 0142e28aa342ecc6cdb3fbdf01446544222f9609 /Configurations/platform | |
| parent | 0bd138b8c36c7e8e504beb2c12a2771929c24cfb (diff) | |
Configuration: rework how dependency making is handled
Previously, we had dependency making pretty much hard coded in the
build file templates, with a bit of an exception for Unix family
platforms, where we had different cases depending on what dependency
making program was found.
With the Embarcadero C++ builder, a separate scheme appeared, with a
different logic.
This change merges the two, and introduces two config target
attributes:
makedepcmd The program to use, where this is relevant.
This replaces the earlier configuration
attribute 'makedepprog'.
makedep_scheme This is a keyword that can be used by build
files templates to produce different sorts of
commands, but most importantly, to pass as
argument to util/add-depend.pl, which uses
this keyword as a "producer" for the
dependency lines.
If the config target doesn't define the 'makedep_scheme' attribute,
Configure tries to figure it out by looking for GCC compatible
compilers or for the 'makedepend' command.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/15006)
Diffstat (limited to 'Configurations/platform')
| -rw-r--r-- | Configurations/platform/Unix.pm | 2 | ||||
| -rw-r--r-- | Configurations/platform/mingw.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/platform/Unix.pm b/Configurations/platform/Unix.pm index f05ff67ad2..0c03c07930 100644 --- a/Configurations/platform/Unix.pm +++ b/Configurations/platform/Unix.pm @@ -32,7 +32,7 @@ sub shlibextsimple { (my $x = $target{shared_extension} || '.so') =~ s|\.\$\(SHLIB_VERSION_NUMBER\)||; $x; } sub shlibvariant { $target{shlib_variant} || "" } -sub makedepprog { $disabled{makedepend} ? undef : $config{makedepprog} } +sub makedepcmd { $disabled{makedepend} ? undef : $config{makedepcmd} } # No conversion of assembler extension on Unix sub asm { diff --git a/Configurations/platform/mingw.pm b/Configurations/platform/mingw.pm index d525ae8e57..c4dbce8041 100644 --- a/Configurations/platform/mingw.pm +++ b/Configurations/platform/mingw.pm @@ -23,7 +23,7 @@ sub resext { '.res.obj' } sub shlibext { '.dll' } sub shlibextimport { $target{shared_import_extension} || '.dll.a' } sub shlibextsimple { undef } -sub makedepprog { $disabled{makedepend} ? undef : $config{makedepprog} } +sub makedepcmd { $disabled{makedepend} ? undef : $config{makedepcmd} } (my $sover_filename = $config{shlib_version}) =~ s|\.|_|g; sub shlib_version_as_filename { |