diff options
author | Richard Levitte <levitte@openssl.org> | 2016-05-02 17:05:48 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-05-02 20:19:41 +0200 |
commit | 38add2300f5f6ef9c46eabc13537eaf50c51131d (patch) | |
tree | a05fb5b4421dab5e1d111fc3244d30c2ce4e42c3 | |
parent | b5293d4c8dde9f71df27723071869ac8b62a0649 (diff) | |
download | openssl-38add2300f5f6ef9c46eabc13537eaf50c51131d.tar.gz |
Add the possibility for local build file templates
Use the environment variable OPENSSL_LOCAL_CONFIG_DIR to find build
file templates as well.
Reviewed-by: Stephen Henson <steve@openssl.org>
-rwxr-xr-x | Configure | 27 |
1 files changed, 21 insertions, 6 deletions
@@ -1238,12 +1238,27 @@ my $buildinfo_debug = defined($ENV{CONFIGURE_DEBUG_BUILDINFO}); if ($builder eq "unified") { # Store the name of the template file we will build the build file from # in %config. This may be useful for the build file itself. - my $build_file_template = - catfile($srcdir, "Configurations", - $builder_platform."-".$target{build_file}.".tmpl"); - $build_file_template = - catfile($srcdir, "Configurations", $target{build_file}.".tmpl") - if (! -f $build_file_template); + my $build_file_template; + + for my $filename (( $builder_platform."-".$target{build_file}.".tmpl", + $target{build_file}.".tmpl" )) { + if (defined $ENV{$local_config_envname}) { + if ($^O eq 'VMS') { + # VMS environment variables are logical names, + # which can be used as is + $build_file_template = $local_config_envname . ':' . $filename; + } else { + $build_file_template = catfile($ENV{$local_config_envname}, + $filename); + } + } + + last if -f $build_file_template; + + $build_file_template = catfile($srcdir, "Configurations", $filename); + + last if -f $build_file_template; + } $config{build_file_template} = $build_file_template; use lib catdir(dirname(__FILE__),"util"); |