X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fcompile.c;h=b88c1d865186b636e35ee359186517196d80b7ac;hp=3ab1afaa3158cd44fa050da15892a355f476db6a;hb=5b3a4c71fa765379906b2f4e3c90e8fdd5d1c255;hpb=03a596908b779bbb4b7c2f739c5e238f8c5d6390

diff --git a/tools/compile.c b/tools/compile.c
index 3ab1afaa..b88c1d86 100644
--- a/tools/compile.c
+++ b/tools/compile.c
@@ -1,14 +1,22 @@
 #include "tools.h"
-#include <ccan/talloc/talloc.h>
 #include <stdlib.h>
 
+#ifndef CCAN_COMPILER
+#define CCAN_COMPILER DEFAULT_CCAN_COMPILER
+#endif
+#ifndef CCAN_CFLAGS
+#define CCAN_CFLAGS DEFAULT_CCAN_CFLAGS
+#endif
+const char *compiler = CCAN_COMPILER;
+const char *cflags = CCAN_CFLAGS;
+
 bool compile_verbose = false;
 
 /* Compile multiple object files into a single.  Returns NULL if fails. */
-char *link_objects(const void *ctx, const char *basename, bool in_pwd,
+char *link_objects(const void *ctx, const char *basename,
 		   const char *objs, char **errmsg)
 {
-	char *file = maybe_temp_file(ctx, ".o", in_pwd, basename);
+	char *file = temp_file(ctx, ".o", basename);
 
 	if (compile_verbose)
 		printf("Linking objects into %s\n", file);
@@ -16,31 +24,34 @@ char *link_objects(const void *ctx, const char *basename, bool in_pwd,
 	if (run_command(ctx, NULL, errmsg, "ld -r -o %s %s", file, objs))
 		return file;
 
-	talloc_free(file);
+	tal_free(file);
 	return NULL;
 }
 
 /* Compile a single C file to an object file. */
 bool compile_object(const void *ctx, const char *cfile, const char *ccandir,
-		    const char *extra_cflags,
+		    const char *compiler,
+		    const char *cflags,
 		    const char *outfile, char **output)
 {
 	if (compile_verbose)
 		printf("Compiling %s\n", outfile);
-	return run_command(ctx, NULL, output, CCAN_COMPILER " " CCAN_CFLAGS
-			   " -I%s %s -c -o %s %s",
-			   ccandir, extra_cflags, outfile, cfile);
+	return run_command(ctx, NULL, output,
+			   "%s %s -I%s -c -o %s %s",
+			   compiler, cflags, ccandir, outfile, cfile);
 }
 
 /* Compile and link single C file, with object files.
  * Returns false on failure. */
 bool compile_and_link(const void *ctx, const char *cfile, const char *ccandir,
-		      const char *objs, const char *extra_cflags,
+		      const char *objs, const char *compiler,
+		      const char *cflags,
 		      const char *libs, const char *outfile, char **output)
 {
 	if (compile_verbose)
 		printf("Compiling and linking %s\n", outfile);
-	return run_command(ctx, NULL, output, CCAN_COMPILER " " CCAN_CFLAGS
-			   " -I%s %s -o %s %s %s %s",
-			   ccandir, extra_cflags, outfile, cfile, objs, libs);
+	return run_command(ctx, NULL, output,
+			   "%s %s -I%s -o %s %s %s %s",
+			   compiler, cflags,
+			   ccandir, outfile, cfile, objs, libs);
 }