X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Fcompulsory_tests%2Fmodule_links.c;h=0bf9821555d70b53c98f6c767b8b36726b58bc72;hp=83b1c780e067046cc715fc479f7e79c64e22cdda;hb=12652625db55f6586e95fc5edc73e1e85bae8a5c;hpb=051db34fb275491d4d5dfa5bf7970e8e525766d8

diff --git a/tools/ccanlint/compulsory_tests/module_links.c b/tools/ccanlint/compulsory_tests/module_links.c
index 83b1c780..0bf98215 100644
--- a/tools/ccanlint/compulsory_tests/module_links.c
+++ b/tools/ccanlint/compulsory_tests/module_links.c
@@ -28,9 +28,10 @@ static char *obj_list(const struct manifest *m)
 
 	/* Other CCAN deps. */
 	list_for_each(&m->deps, i, list) {
-		if (i->compiled)
+		if (i->compiled[COMPILE_NORMAL])
 			list = talloc_asprintf_append(list, "%s ",
-						      i->compiled);
+						      i->compiled
+						      [COMPILE_NORMAL]);
 	}
 	return list;
 }
@@ -38,7 +39,8 @@ static char *obj_list(const struct manifest *m)
 static char *lib_list(const struct manifest *m)
 {
 	unsigned int i, num;
-	char **libs = get_libs(m, ".", &num, &m->info_file->compiled);
+	char **libs = get_libs(m, ".",
+			       &num, &m->info_file->compiled[COMPILE_NORMAL]);
 	char *ret = talloc_strdup(m, "");
 
 	for (i = 0; i < num; i++)
@@ -72,8 +74,8 @@ static void check_use_build(struct manifest *m,
 		err(1, "Failure writing to temporary file %s", tmpfile);
 	close(fd);
 
-	if (compile_and_link(score, tmpfile, ccan_dir, obj_list(m), "",
-			     lib_list(m),
+	if (compile_and_link(score, tmpfile, ccan_dir, obj_list(m),
+			     compiler, cflags, lib_list(m),
 			     maybe_temp_file(m, "", keep, tmpfile),
 			     &cmdout)) {
 		score->pass = true;