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

diff --git a/tools/compile.c b/tools/compile.c
index 3ab1afaa..ec7e2147 100644
--- a/tools/compile.c
+++ b/tools/compile.c
@@ -22,25 +22,28 @@ char *link_objects(const void *ctx, const char *basename, bool in_pwd,
 
 /* 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);
 }