X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fcompile.c;h=089a9ab03c3dc25760b0fdd501f78a89df95ec9f;hp=910b9462b1a3d452245db88deacf509cdb5e2bfe;hb=304652023042670b3173de0ad5dc0eb7c836618c;hpb=687cde2a8c561b68f17609b615eb930ea02f5aac

diff --git a/tools/compile.c b/tools/compile.c
index 910b9462..089a9ab0 100644
--- a/tools/compile.c
+++ b/tools/compile.c
@@ -7,7 +7,7 @@ char *link_objects(const void *ctx, const char *objs, char **errmsg)
 {
 	char *file = temp_file(ctx, ".o");
 
-	*errmsg = run_command(ctx, "ld -r -o %s %s", file, objs);
+	*errmsg = run_command(ctx, NULL, "ld -r -o %s %s", file, objs);
 	if (*errmsg) {
 		talloc_free(file);
 		return NULL;
@@ -16,11 +16,13 @@ char *link_objects(const void *ctx, const char *objs, char **errmsg)
 }
 
 /* Compile a single C file to an object file.  Returns errmsg if fails. */
-char *compile_object(const void *ctx, const char *cfile, char **errmsg)
+char *compile_object(const void *ctx, const char *cfile, const char *ccandir,
+		     char **errmsg)
 {
 	char *file = temp_file(ctx, ".o");
 
-	*errmsg = run_command(ctx, "cc " CFLAGS " -c -o %s %s", file, cfile);
+	*errmsg = run_command(ctx, NULL, "cc " CFLAGS " -I%s -c -o %s %s",
+			      ccandir, file, cfile);
 	if (*errmsg) {
 		talloc_free(file);
 		return NULL;
@@ -30,14 +32,14 @@ char *compile_object(const void *ctx, const char *cfile, char **errmsg)
 
 /* 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)
+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)
 {
 	char *file = temp_file(ctx, "");
 
-	*errmsg = run_command(ctx, "cc " CFLAGS " %s -o %s %s %s %s",
-			      extra_cflags, file, cfile, objs, libs);
+	*errmsg = run_command(ctx, NULL, "cc " CFLAGS " -I%s %s -o %s %s %s %s",
+			      ccandir, extra_cflags, file, cfile, objs, libs);
 	if (*errmsg) {
 		talloc_free(file);
 		return NULL;