|
@@ -1446,7 +1446,7 @@ $target{build_scheme} = [ $target{build_scheme} ]
|
|
|
my ($builder, $builder_platform, @builder_opts) =
|
|
|
@{$target{build_scheme}};
|
|
|
|
|
|
-foreach my $checker (($builder_platform."-".$target{build_file}."-checker.pm",
|
|
|
+foreach my $checker (($builder_platform."-".$config{build_file}."-checker.pm",
|
|
|
$builder_platform."-checker.pm")) {
|
|
|
my $checker_path = catfile($srcdir, "Configurations", $checker);
|
|
|
if (-f $checker_path) {
|
|
@@ -1912,8 +1912,8 @@ 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" );
|
|
|
+ ( $builder_platform."-".$config{build_file}.".tmpl",
|
|
|
+ $config{build_file}.".tmpl" );
|
|
|
my @build_file_templates = ();
|
|
|
|
|
|
# First, look in the user provided directory, if given
|
|
@@ -2930,7 +2930,7 @@ exit(0);
|
|
|
#
|
|
|
sub death_handler {
|
|
|
die @_ if $^S; # To prevent the added message in eval blocks
|
|
|
- my $build_file = $target{build_file} // "build file";
|
|
|
+ my $build_file = $config{build_file} // "build file";
|
|
|
my @message = ( <<"_____", @_ );
|
|
|
|
|
|
Failure! $build_file wasn't produced.
|