tools/configurator: allow overriding of which cc we will run.

[ccan] / tools / configurator / configurator.c

diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index 6ec30bd6deb77596fde041983175f4eaa117741d..ff9f64904bb06a7759c7c453fbf53a3dae47f5e8 100644 (file)
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -315,6 +315,8 @@ static struct test tests[] = {
          "#include <sys/filio.h>\n" },
        { "HAVE_SYS_TERMIOS_H", OUTSIDE_MAIN, NULL, NULL,
          "#include <sys/termios.h>\n" },
+       { "HAVE_SYS_UNISTD_H", OUTSIDE_MAIN, NULL, NULL,
+         "#include <sys/unistd.h>\n" },
        { "HAVE_TYPEOF", INSIDE_MAIN, NULL, NULL,
          "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" },
        { "HAVE_UNALIGNED_ACCESS", DEFINES_EVERYTHING|EXECUTE, NULL, NULL,
@@ -668,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,
@@ -699,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;
                }
@@ -707,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]);
@@ -721,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);