Adjust how to clear a shell script env variable

[buildfarm-client.git] / run_build.pl

diff --git a/run_build.pl b/run_build.pl
index bc15dd004a440bf798cb8e3702715c7647db3df8..9e68d8d05a9cae8591af780380d07aa3d30e955c 100755 (executable)
--- a/run_build.pl
+++ b/run_build.pl
@@ -313,7 +313,8 @@ foreach my $oldfile (glob("last*"))
 
 my $branch_root = getcwd();
 
 
 my $branch_root = getcwd();
 

-# make sure we are using GNU make
+# Normally we would require GNU Make, but allow farm
+# configuration to override this

 die "$make is not GNU Make - please fix config file"
   unless check_make();
 
 die "$make is not GNU Make - please fix config file"
   unless check_make();
 


@@ -766,9 +767,9 @@ sub check_optional_step
         &&grep {$_ eq $wday} @{$oconf->{dow}});
 
     my $last_step = $last_status = find_last("$step") || 0;
         &&grep {$_ eq $wday} @{$oconf->{dow}});
 
     my $last_step = $last_status = find_last("$step") || 0;

-
-    return undef unless ($forcerun ||
-                         time >$last_step + (3600 * $oconf->{min_hours_since}));
+    ## If made it *to* these optional steps, we just run them and reset last time
+    #return undef unless ($forcerun ||
+    #                     time >$last_step + (3600 * $oconf->{min_hours_since}));

     set_last("$step") unless $nostatus;
 
     return 1;
     set_last("$step") unless $nostatus;
 
     return 1;


@@ -827,6 +828,12 @@ sub display_features
     
 sub check_make
 {
     
 sub check_make
 {

+    # Allow farm member to configure non-GNU make
+    my $non_gnu_make = $EximBuild::conf{non_gnu_make};
+    if (!defined $non_gnu_make ||
+        (defined $non_gnu_make && $non_gnu_make == 1)) {
+      return 'OK';
+    }

     my @out = `$make -v 2>&1`;
     return undef unless ($? == 0 && grep {/GNU Make/} @out);
     return 'OK';
     my @out = `$make -v 2>&1`;
     return undef unless ($? == 0 && grep {/GNU Make/} @out);
     return 'OK';