зеркало из https://github.com/mozilla/gecko-dev.git
Other env vars that need to be cleared properly
This commit is contained in:
Родитель
d7c4286519
Коммит
26a2eec56a
|
@ -883,6 +883,7 @@ sub do_action {
|
||||||
print "@@@ mozconfig:\n$mozconfig\n@@@ network .mozconfig:\n$build_vars->{MOZCONFIG}\n";
|
print "@@@ mozconfig:\n$mozconfig\n@@@ network .mozconfig:\n$build_vars->{MOZCONFIG}\n";
|
||||||
if ($build_vars->{MOZCONFIG}) {
|
if ($build_vars->{MOZCONFIG}) {
|
||||||
if ($mozconfig ne $build_vars->{MOZCONFIG}) {
|
if ($mozconfig ne $build_vars->{MOZCONFIG}) {
|
||||||
|
$ENV{MOZCONFIG} = undef;
|
||||||
delete $ENV{MOZCONFIG};
|
delete $ENV{MOZCONFIG};
|
||||||
$client->start_section("CREATING MOZCONFIG");
|
$client->start_section("CREATING MOZCONFIG");
|
||||||
open MOZCONFIG, ">.mozconfig";
|
open MOZCONFIG, ">.mozconfig";
|
||||||
|
@ -1082,9 +1083,13 @@ sub get_config {
|
||||||
|
|
||||||
sub finish_build {
|
sub finish_build {
|
||||||
my ($client, $config, $persistent_vars, $build_vars) = @_;
|
my ($client, $config, $persistent_vars, $build_vars) = @_;
|
||||||
|
$ENV{MOZILLA_OFFICIAL} = undef;
|
||||||
delete $ENV{MOZILLA_OFFICIAL};
|
delete $ENV{MOZILLA_OFFICIAL};
|
||||||
|
$ENV{BUILD_OFFICIAL} = undef;
|
||||||
delete $ENV{BUILD_OFFICIAL};
|
delete $ENV{BUILD_OFFICIAL};
|
||||||
|
$ENV{MOZ_CO_DATE} = undef;
|
||||||
delete $ENV{MOZ_CO_DATE};
|
delete $ENV{MOZ_CO_DATE};
|
||||||
|
$ENV{MOZ_OBJDIR} = undef;
|
||||||
delete $ENV{MOZ_OBJDIR};
|
delete $ENV{MOZ_OBJDIR};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче