From c65bb1c114c13b52fda23774fef035117cf2f7d4 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 8 Sep 2019 18:18:20 +0100
Subject: [PATCH] bin/cross-run.in: Pass `-k', `-n' and `-s' flags through to
 `make'.

---
 src/cross-run.in | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/cross-run.in b/src/cross-run.in
index 0124572..9dffa85 100644
--- a/src/cross-run.in
+++ b/src/cross-run.in
@@ -50,15 +50,21 @@ for my $f (split ' ', $C{"FLAVOURS"}) {
 
 our @ARCH = ();
 our $JOBS = undef;
+our $KEEPGOING = 0;
+our $SILENT = 0;
+our $DRYRUN = 0;
 our $DIR = ".";
 our $MARKER = "{}";
 our @CMD = ();
 
-my $mo = new MdwOpt "hC:j:m:",
+my $mo = new MdwOpt "hC:j:km:ns",
   { "help" => { 'return' => "h" },
     "directory" => { 'return' => 'C', 'arg' => 'req' },
     "jobs" => { 'return' => "j", 'arg' => 'req' },
-    "marker" => { 'return' => "m", 'arg' => 'req' } },
+    "keep-going" => { 'return' => "k" },
+    "marker" => { 'return' => "m", 'arg' => 'req' },
+    "dry-run" => { 'return' => "n" },
+    "silent" => { 'return' => "s" } },
   \@ARGV,
   ['inorder'];
 my $bad = 0;
@@ -69,7 +75,10 @@ OPT: for (;;) {
   elsif ($opt eq "C") { $DIR = $arg; }
   elsif ($opt eq "j")
     { $arg =~ /^[+]?\d+$/ or barf "bad integer `$arg'"; $JOBS = $arg; }
+  elsif ($opt eq "k") { $KEEPGOING = 1; }
   elsif ($opt eq "m") { $MARKER = $arg; }
+  elsif ($opt eq "n") { $DRYRUN = $arg; }
+  elsif ($opt eq "s") { $SILENT = $arg; }
   elsif ($opt eq '') {
     if ($arg =~ /^=(.*)$/) {
       my $pat = $1;
@@ -111,6 +120,9 @@ if ($CMD[0] eq 'make') { $TARGET = "run-make"; shift @CMD; }
 our @MAKE = ("make");
 push @MAKE, "-f$CROSSDIR/Makefile";
 push @MAKE, "-j$JOBS" if defined $JOBS;
+push @MAKE, "-k" if $KEEPGOING;
+push @MAKE, "-n" if $DRYRUN;
+push @MAKE, "-s" if $SILENT;
 push @MAKE, $TARGET;
 push @MAKE, "ARCHS=" . join " ", @ARCH;
 push @MAKE, "ARGS=" . join " ", map { hack $_ } @CMD;
-- 
2.11.0