From 8c2a556f55df0877d8564af6c11043d3e041db12 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 26 Feb 2018 13:16:38 +1030
Subject: [PATCH] ccan: update so we get configurator with --configurator-cc=
 arg.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 ccan/README                            |  2 +-
 ccan/tools/configurator/configurator.c | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ccan/README b/ccan/README
index 91800fde4..7fa333ec8 100644
--- a/ccan/README
+++ b/ccan/README
@@ -1,3 +1,3 @@
 CCAN imported from http://ccodearchive.net.
 
-CCAN version: init-2402-gec1f7161
+CCAN version: init-2403-g8502a66a
diff --git a/ccan/tools/configurator/configurator.c b/ccan/tools/configurator/configurator.c
index 52c0243b4..ff9f64904 100644
--- a/ccan/tools/configurator/configurator.c
+++ b/ccan/tools/configurator/configurator.c
@@ -670,13 +670,15 @@ int main(int argc, const char *argv[])
 	const char *default_args[]
 		= { "", DEFAULT_COMPILER, DEFAULT_FLAGS, NULL };
 	const char *outflag = DEFAULT_OUTPUT_EXE_FLAG;
+	const char *configurator_cc = NULL;
+	const char *orig_cc;
 
 	if (argc > 0)
 		progname = argv[0];
 
 	while (argc > 1) {
 		if (strcmp(argv[1], "--help") == 0) {
-			printf("Usage: configurator [-v] [-O<outflag>] [<compiler> <flags>...]\n"
+			printf("Usage: configurator [-v] [-O<outflag>] [--configurator-cc=<compiler-for-tests>] [<compiler> <flags>...]\n"
 			       "  <compiler> <flags> will have \"<outflag> <outfile> <infile.c>\" appended\n"
 			       "Default: %s %s %s\n",
 			       DEFAULT_COMPILER, DEFAULT_FLAGS,
@@ -701,6 +703,10 @@ int main(int argc, const char *argv[])
 			argc--;
 			argv++;
 			verbose += 2;
+		} else if (strncmp(argv[1], "--configurator-cc=", 18) == 0) {
+			configurator_cc = argv[1] + 18;
+			argc--;
+			argv++;
 		} else {
 			break;
 		}
@@ -709,6 +715,10 @@ int main(int argc, const char *argv[])
 	if (argc == 1)
 		argv = default_args;
 
+	orig_cc = argv[1];
+	if (configurator_cc)
+		argv[1] = configurator_cc;
+
 	cmd = connect_args(argv, outflag, OUTPUT_FILE " " INPUT_FILE);
 	for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++)
 		run_test(cmd, &tests[i]);
@@ -723,7 +733,7 @@ int main(int argc, const char *argv[])
 	printf("#ifndef _GNU_SOURCE\n");
 	printf("#define _GNU_SOURCE /* Always use GNU extensions. */\n");
 	printf("#endif\n");
-	printf("#define CCAN_COMPILER \"%s\"\n", argv[1]);
+	printf("#define CCAN_COMPILER \"%s\"\n", orig_cc);
 	cmd = connect_args(argv + 1, "", "");
 	printf("#define CCAN_CFLAGS \"%s\"\n", cmd);
 	free(cmd);