diff options
author | Richard Levitte <levitte@openssl.org> | 2016-09-15 23:55:24 +0200 |
---|---|---|
committer | Richard Levitte <richard@levitte.org> | 2016-09-16 11:53:30 +0200 |
commit | 5dab48340ecce1ff33f267ff07c6a7b485dce32f (patch) | |
tree | d563deed249db0004ef6fc0049878e87f3eff687 | |
parent | b5edd178ca6895fd0e263eacef83e48e374669e5 (diff) |
Rearrange the storage of build file template names in %config
They are now relative paths as well
Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 1967a42eb5192efc552287f78850420082caba7c)
-rwxr-xr-x | Configure | 82 |
1 files changed, 42 insertions, 40 deletions
@@ -1299,44 +1299,6 @@ my %unified_info = (); 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_names = - ( $builder_platform."-".$target{build_file}.".tmpl", - $target{build_file}.".tmpl" ); - my @build_file_templates = (); - - # First, look in the user provided directory, if given - if (defined $ENV{$local_config_envname}) { - @build_file_templates = - map { - if ($^O eq 'VMS') { - # VMS environment variables are logical names, - # which can be used as is - $local_config_envname . ':' . $_; - } else { - catfile($ENV{$local_config_envname}, $_); - } - } - @build_file_template_names; - } - # Then, look in our standard directory - push @build_file_templates, - ( map { catfile($srcdir, "Configurations", $_) } - @build_file_template_names ); - - my $build_file_template; - for $_ (@build_file_templates) { - $build_file_template = $_; - last if -f $build_file_template; - - $build_file_template = undef; - } - if (!defined $build_file_template) { - die "*** Couldn't find any of:\n", join("\n", @build_file_templates), "\n"; - } - $config{build_file_template} = $build_file_template; - use lib catdir(dirname(__FILE__),"util"); use with_fallback qw(Text::Template); @@ -1373,6 +1335,47 @@ if ($builder eq "unified") { return $res; } + # 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_names = + ( $builder_platform."-".$target{build_file}.".tmpl", + $target{build_file}.".tmpl" ); + my @build_file_templates = (); + + # First, look in the user provided directory, if given + if (defined $ENV{$local_config_envname}) { + @build_file_templates = + map { + if ($^O eq 'VMS') { + # VMS environment variables are logical names, + # which can be used as is + $local_config_envname . ':' . $_; + } else { + catfile($ENV{$local_config_envname}, $_); + } + } + @build_file_template_names; + } + # Then, look in our standard directory + push @build_file_templates, + ( map { cleanfile($srcdir, catfile("Configurations", $_), $blddir) } + @build_file_template_names ); + + my $build_file_template; + for $_ (@build_file_templates) { + $build_file_template = $_; + last if -f $build_file_template; + + $build_file_template = undef; + } + if (!defined $build_file_template) { + die "*** Couldn't find any of:\n", join("\n", @build_file_templates), "\n"; + } + $config{build_file_templates} + = [ $build_file_template, + cleanfile($srcdir, catfile("Configurations", "common.tmpl"), + $blddir) ]; + my @build_infos = ( [ ".", "build.info" ] ); foreach (@{$config{dirs}}) { push @build_infos, [ $_, "build.info" ] @@ -2048,8 +2051,7 @@ print "RC4 uses $config{rc4_int}\n" if $config{rc4_int} ne $def_int; my %builders = ( unified => sub { run_dofile(catfile($blddir, $target{build_file}), - $config{build_file_template}, - catfile($srcdir, "Configurations", "common.tmpl")); + @{$config{build_file_templates}}); }, ); |