typesafe_cb: fix example macro ordering in typesafe_cb_preargs documentation.

[ccan] / tools / compile.c

diff --git a/tools/compile.c b/tools/compile.c
index 6707c4a68c99af055efe47a5428d6a6cf74faf5a..ec7e2147b239ddb568acee8a87973dc05757db85 100644 (file)
--- a/tools/compile.c
+++ b/tools/compile.c
@@ -4,7 +4,7 @@
 
 bool compile_verbose = false;
 
-/* Compile multiple object files into a single.  Returns errmsg if fails. */
+/* Compile multiple object files into a single.  Returns NULL if fails. */
 char *link_objects(const void *ctx, const char *basename, bool in_pwd,
                   const char *objs, char **errmsg)
 {
@@ -13,33 +13,37 @@ char *link_objects(const void *ctx, const char *basename, bool in_pwd,
        if (compile_verbose)
                printf("Linking objects into %s\n", file);
 
-       *errmsg = run_command(ctx, NULL, "ld -r -o %s %s", file, objs);
-       if (*errmsg) {
-               talloc_free(file);
-               return NULL;
-       }
-       return file;
+       if (run_command(ctx, NULL, errmsg, "ld -r -o %s %s", file, objs))
+               return file;
+
+       talloc_free(file);
+       return NULL;
 }
 
-/* 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)
+/* Compile a single C file to an object file. */
+bool compile_object(const void *ctx, const char *cfile, const char *ccandir,
+                   const char *compiler,
+                   const char *cflags,
+                   const char *outfile, char **output)
 {
        if (compile_verbose)
                printf("Compiling %s\n", outfile);
-       return run_command(ctx, NULL, "cc " CFLAGS " -I%s %s -c -o %s %s",
-                          ccandir, extra_cflags, outfile, cfile);
+       return run_command(ctx, NULL, output,
+                          "%s %s -I%s -c -o %s %s",
+                          compiler, cflags, ccandir, outfile, cfile);
 }
 
 /* Compile and link single C file, with object files.
- * Returns error message or NULL on success. */
-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)
+ * Returns false on failure. */
+bool compile_and_link(const void *ctx, const char *cfile, const char *ccandir,
+                     const char *objs, const char *compiler,
+                     const char *cflags,
+                     const char *libs, const char *outfile, char **output)
 {
        if (compile_verbose)
                printf("Compiling and linking %s\n", outfile);
-       return run_command(ctx, NULL, "cc " CFLAGS " -I%s %s -o %s %s %s %s",
-                          ccandir, extra_cflags, outfile, cfile, objs, libs);
+       return run_command(ctx, NULL, output,
+                          "%s %s -I%s -o %s %s %s %s",
+                          compiler, cflags,
+                          ccandir, outfile, cfile, objs, libs);
 }