X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fcompile.c;h=8f80734b095d5ad06f0aec2f696b3197eaf0a4c2;hp=5ec41228f59e51de3d2b5819a34a0eede4fcfa22;hb=f6b26e5dd31a809ac14daac0bbc57b5f63e5e856;hpb=3612661714e86333ceacca7314959a5ed938dc6a

diff --git a/tools/compile.c b/tools/compile.c
index 5ec41228..8f80734b 100644
--- a/tools/compile.c
+++ b/tools/compile.c
@@ -2,31 +2,46 @@
 #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 *outfile, const char *objs)
+char *link_objects(const void *ctx, const char *basename, bool in_pwd,
+		   const char *objs, char **errmsg)
 {
-	return run_command(ctx, "cc " CFLAGS " -c -o %s %s", outfile, objs);
+	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) {
+		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,
+		     const char *extra_cflags,
+		     const char *outfile)
 {
-	return run_command(ctx, "cc " CFLAGS " -c -o %s %s", 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.
- * 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;
+	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);
 }