typesafe_cb: fix up (and test!) cast_if_any.

[ccan] / tools / compile.c

diff --git a/tools/compile.c b/tools/compile.c
index 5ec41228f59e51de3d2b5819a34a0eede4fcfa22..089a9ab03c3dc25760b0fdd501f78a89df95ec9f 100644 (file)
--- a/tools/compile.c
+++ b/tools/compile.c
@@ -3,27 +3,43 @@
 #include <stdlib.h>
 
 /* Compile multiple object files into a single.  Returns errmsg if fails. */
-char *link_objects(const void *ctx, const char *outfile, const char *objs)
+char *link_objects(const void *ctx, const char *objs, char **errmsg)
 {
-       return run_command(ctx, "cc " CFLAGS " -c -o %s %s", outfile, objs);
+       char *file = temp_file(ctx, ".o");
+
+       *errmsg = run_command(ctx, NULL, "ld -r -o %s %s", file, objs);
+       if (*errmsg) {
+               talloc_free(file);
+               return NULL;
+       }
+       return file;
 }
 
 /* Compile a single C file to an object file.  Returns errmsg if fails. */
-char *compile_object(const void *ctx, const char *outfile, const char *cfile)
+char *compile_object(const void *ctx, const char *cfile, const char *ccandir,
+                    char **errmsg)
 {
-       return run_command(ctx, "cc " CFLAGS " -c -o %s %s", outfile, cfile);
+       char *file = temp_file(ctx, ".o");
+
+       *errmsg = run_command(ctx, NULL, "cc " CFLAGS " -I%s -c -o %s %s",
+                             ccandir, file, cfile);
+       if (*errmsg) {
+               talloc_free(file);
+               return NULL;
+       }
+       return file;
 }
 
 /* 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)
+char *compile_and_link(const void *ctx, const char *cfile, const char *ccandir,
+                      const char *objs, const char *extra_cflags,
+                      const char *libs, char **errmsg)
 {
        char *file = temp_file(ctx, "");
 
-       *errmsg = run_command(ctx, "cc " CFLAGS " %s -o %s %s %s %s",
-                             extra_cflags, file, cfile, objs, libs);
+       *errmsg = run_command(ctx, NULL, "cc " CFLAGS " -I%s %s -o %s %s %s %s",
+                             ccandir, extra_cflags, file, cfile, objs, libs);
        if (*errmsg) {
                talloc_free(file);
                return NULL;