ccanlint: Add -k option to keep results.

[ccan] / tools / compile.c

diff --git a/tools/compile.c b/tools/compile.c
index 910b9462b1a3d452245db88deacf509cdb5e2bfe..fc7dc34789fbcfac6c832fce41ff7b6e0253499c 100644 (file)
--- a/tools/compile.c
+++ b/tools/compile.c
@@ -7,7 +7,7 @@ char *link_objects(const void *ctx, const char *objs, char **errmsg)
 {
        char *file = temp_file(ctx, ".o");
 
-       *errmsg = run_command(ctx, "ld -r -o %s %s", file, objs);
+       *errmsg = run_command(ctx, NULL, "ld -r -o %s %s", file, objs);
        if (*errmsg) {
                talloc_free(file);
                return NULL;
@@ -16,31 +16,19 @@ 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, char **errmsg)
+char *compile_object(const void *ctx, const char *cfile, const char *ccandir,
+                    const char *outfile)
 {
-       char *file = temp_file(ctx, ".o");
-
-       *errmsg = run_command(ctx, "cc " CFLAGS " -c -o %s %s", file, cfile);
-       if (*errmsg) {
-               talloc_free(file);
-               return NULL;
-       }
-       return file;
+       return run_command(ctx, NULL, "cc " CFLAGS " -I%s -c -o %s %s",
+                          ccandir, outfile, cfile);
 }
 
 /* Compile and link single C file, with object files.
- * Returns name of result, or NULL (and fills in errmsg). */
-char *compile_and_link(const void *ctx, const char *cfile, const char *objs,
-                      const char *extra_cflags, const char *libs,
-                      char **errmsg)
+ * 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)
 {
-       char *file = temp_file(ctx, "");
-
-       *errmsg = run_command(ctx, "cc " CFLAGS " %s -o %s %s %s %s",
-                             extra_cflags, file, cfile, objs, libs);
-       if (*errmsg) {
-               talloc_free(file);
-               return NULL;
-       }
-       return file;
+       return run_command(ctx, NULL, "cc " CFLAGS " -I%s %s -o %s %s %s %s",
+                          ccandir, extra_cflags, outfile, cfile, objs, libs);
 }