X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fcompile.c;h=e796e3f97a9be24b6c1edd5d8dd43b26ffd2d8dd;hp=f166512eb5fe609d13c911af4c72ac0ccd99cf01;hb=6ac981db899685916603fd2e12dcbbd760a2b294;hpb=747a69435d9f83c0968d9689c4951bc0233ffc5e

diff --git a/tools/compile.c b/tools/compile.c
index f166512e..e796e3f9 100644
--- a/tools/compile.c
+++ b/tools/compile.c
@@ -1,48 +1,62 @@
 #include "tools.h"
-#include <ccan/talloc/talloc.h>
 #include <stdlib.h>
 
-/* Compile multiple object files into a single.  Returns errmsg if fails. */
-char *link_objects(const void *ctx, const char *objs, char **errmsg)
+#ifndef CCAN_COMPILER
+#define CCAN_COMPILER DEFAULT_CCAN_COMPILER
+#endif
+#ifndef CCAN_CFLAGS
+#define CCAN_CFLAGS DEFAULT_CCAN_CFLAGS
+#endif
+#ifndef CCAN_OUTPUT_EXE_CFLAG
+#define CCAN_OUTPUT_EXE_CFLAG DEFAULT_CCAN_OUTPUT_EXE_CFLAG
+#endif
+const char *compiler = CCAN_COMPILER;
+const char *cflags = CCAN_CFLAGS;
+const char *outexecflag = CCAN_OUTPUT_EXE_CFLAG;
+
+bool compile_verbose = false;
+
+/* Compile multiple object files into a single.  Returns NULL if fails. */
+char *link_objects(const void *ctx, const char *basename,
+		   const char *objs, char **errmsg)
 {
-	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;
+	char *file = temp_file(ctx, ".o", basename);
+
+	if (compile_verbose)
+		printf("Linking objects into %s\n", file);
+
+	if (run_command(ctx, NULL, errmsg, "ld -r -o %s %s", file, objs))
+		return file;
+
+	tal_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,
-		     char **errmsg)
+/* 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)
 {
-	char *file = temp_file(ctx, ".o");
-
-	*errmsg = run_command(ctx, "cc " CFLAGS " -I%s -c -o %s %s",
-			      ccandir, file, cfile);
-	if (*errmsg) {
-		talloc_free(file);
-		return NULL;
-	}
-	return file;
+	if (compile_verbose)
+		printf("Compiling %s\n", outfile);
+	return run_command(ctx, NULL, output,
+			   "%s %s -I%s -c %s%s %s",
+			   compiler, cflags, ccandir,
+			   outexecflag, 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 *ccandir,
-		       const char *objs, const char *extra_cflags,
-		       const char *libs, char **errmsg)
+ * 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)
 {
-	char *file = temp_file(ctx, "");
-
-	*errmsg = run_command(ctx, "cc " CFLAGS " -I%s %s -o %s %s %s %s",
-			      ccandir, 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, output,
+			   "%s %s -I%s %s%s %s %s %s",
+			   compiler, cflags, ccandir,
+			   outexecflag, outfile, cfile, objs, libs);
 }