X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fcompile.c;h=910b9462b1a3d452245db88deacf509cdb5e2bfe;hp=5ec41228f59e51de3d2b5819a34a0eede4fcfa22;hb=f88058f692a182c249f4d3f3a8879846297b50d0;hpb=3612661714e86333ceacca7314959a5ed938dc6a

diff --git a/tools/compile.c b/tools/compile.c
index 5ec41228..910b9462 100644
--- a/tools/compile.c
+++ b/tools/compile.c
@@ -3,15 +3,29 @@
 #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, "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, char **errmsg)
 {
-	return run_command(ctx, "cc " CFLAGS " -c -o %s %s", outfile, cfile);
+	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;
 }
 
 /* Compile and link single C file, with object files.