X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=16f7cb69777cf733f73dda0e2358b2d32308bfb6;hp=ee39a12f134e4405c98f45f10cefe9fff829752a;hb=5a5b9f8d3d187b15b9e7b427c7c3b2ac5ee7c6be;hpb=100444225380d3f5ca29424ea54703d308c7c651

diff --git a/tools/depends.c b/tools/depends.c
index ee39a12f..16f7cb69 100644
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -1,5 +1,5 @@
-#include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
+#include <ccan/talloc/talloc.h>
 #include <ccan/grab_file/grab_file.h>
 #include <ccan/str_talloc/str_talloc.h>
 #include <ccan/read_write_all/read_write_all.h>
@@ -13,7 +13,7 @@
 #include <errno.h>
 
 static char ** __attribute__((format(printf, 2, 3)))
-lines_from_cmd(const void *ctx, char *format, ...)
+lines_from_cmd(const void *ctx, const char *format, ...)
 {
 	va_list ap;
 	char *cmd, *buffer;
@@ -59,10 +59,12 @@ static char *compile_info(const void *ctx, const char *dir)
 		return NULL;
 
 	ccandir = talloc_dirname(ctx, dir);
-	*strrchr(ccandir, '/') = '\0';
+	if (strrchr(ccandir, '/'))
+		*strrchr(ccandir, '/') = '\0';
 
 	compiled = maybe_temp_file(ctx, "", false, "info");
-	if (compile_and_link(ctx, info_c_file, ccandir, "", "", "",
+	if (compile_and_link(ctx, info_c_file, ccandir, "",
+			     CCAN_COMPILER, CCAN_CFLAGS " -I.", "",
 			     compiled, &output))
 		return compiled;
 	return NULL;