.gitignore: ignore configurator

[ccan] / tools / compile.c

diff --git a/tools/compile.c b/tools/compile.c
index fc7dc34789fbcfac6c832fce41ff7b6e0253499c..8f80734b095d5ad06f0aec2f696b3197eaf0a4c2 100644 (file)
--- a/tools/compile.c
+++ b/tools/compile.c
@@ -2,10 +2,16 @@
 #include <ccan/talloc/talloc.h>
 #include <stdlib.h>
 
+bool compile_verbose = false;
+
 /* Compile multiple object files into a single.  Returns errmsg if fails. */
-char *link_objects(const void *ctx, const char *objs, char **errmsg)
+char *link_objects(const void *ctx, const char *basename, bool in_pwd,
+                  const char *objs, char **errmsg)
 {
-       char *file = temp_file(ctx, ".o");
+       char *file = maybe_temp_file(ctx, ".o", in_pwd, basename);
+
+       if (compile_verbose)
+               printf("Linking objects into %s\n", file);
 
        *errmsg = run_command(ctx, NULL, "ld -r -o %s %s", file, objs);
        if (*errmsg) {
@@ -17,10 +23,14 @@ char *link_objects(const void *ctx, const char *objs, char **errmsg)
 
 /* Compile a single C file to an object file.  Returns errmsg if fails. */
 char *compile_object(const void *ctx, const char *cfile, const char *ccandir,
+                    const char *extra_cflags,
                     const char *outfile)
 {
-       return run_command(ctx, NULL, "cc " CFLAGS " -I%s -c -o %s %s",
-                          ccandir, outfile, cfile);
+       if (compile_verbose)
+               printf("Compiling %s\n", outfile);
+       return run_command(ctx, NULL, CCAN_COMPILER " " CCAN_CFLAGS
+                          " -I%s %s -c -o %s %s",
+                          ccandir, extra_cflags, outfile, cfile);
 }
 
 /* Compile and link single C file, with object files.
@@ -29,6 +39,9 @@ char *compile_and_link(const void *ctx, const char *cfile, const char *ccandir,
                       const char *objs, const char *extra_cflags,
                       const char *libs, const char *outfile)
 {
-       return run_command(ctx, NULL, "cc " CFLAGS " -I%s %s -o %s %s %s %s",
+       if (compile_verbose)
+               printf("Compiling and linking %s\n", outfile);
+       return run_command(ctx, NULL, CCAN_COMPILER " " CCAN_CFLAGS
+                          " -I%s %s -o %s %s %s %s",
                           ccandir, extra_cflags, outfile, cfile, objs, libs);
 }