take: add labels when CCAN_TAKE_DEBUG set, return in taken_any().

[ccan] / tools / compile.c

diff --git a/tools/compile.c b/tools/compile.c
index 65283bc7a166bd8d797fa0c444de25fa37014a53..e796e3f97a9be24b6c1edd5d8dd43b26ffd2d8dd 100644 (file)
--- a/tools/compile.c
+++ b/tools/compile.c
@@ -1,6 +1,19 @@
 #include "tools.h"
 #include <stdlib.h>
 
+#ifndef CCAN_COMPILER
+#define CCAN_COMPILER DEFAULT_CCAN_COMPILER
+#endif
+#ifndef CCAN_CFLAGS
+#define CCAN_CFLAGS DEFAULT_CCAN_CFLAGS
+#endif
+#ifndef CCAN_OUTPUT_EXE_CFLAG
+#define CCAN_OUTPUT_EXE_CFLAG DEFAULT_CCAN_OUTPUT_EXE_CFLAG
+#endif
+const char *compiler = CCAN_COMPILER;
+const char *cflags = CCAN_CFLAGS;
+const char *outexecflag = CCAN_OUTPUT_EXE_CFLAG;
+
 bool compile_verbose = false;
 
 /* Compile multiple object files into a single.  Returns NULL if fails. */
@@ -28,8 +41,9 @@ bool compile_object(const void *ctx, const char *cfile, const char *ccandir,
        if (compile_verbose)
                printf("Compiling %s\n", outfile);
        return run_command(ctx, NULL, output,
-                          "%s %s -I%s -c -o %s %s",
-                          compiler, cflags, ccandir, outfile, cfile);
+                          "%s %s -I%s -c %s%s %s",
+                          compiler, cflags, ccandir,
+                          outexecflag, outfile, cfile);
 }
 
 /* Compile and link single C file, with object files.
@@ -42,7 +56,7 @@ bool compile_and_link(const void *ctx, const char *cfile, const char *ccandir,
        if (compile_verbose)
                printf("Compiling and linking %s\n", outfile);
        return run_command(ctx, NULL, output,
-                          "%s %s -I%s -o %s %s %s %s",
-                          compiler, cflags,
-                          ccandir, outfile, cfile, objs, libs);
+                          "%s %s -I%s %s%s %s %s %s",
+                          compiler, cflags, ccandir,
+                          outexecflag, outfile, cfile, objs, libs);
 }