projects
/
ccan
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ccanlint: Add -k option to keep results.
[ccan]
/
tools
/
ccanlint
/
compulsory_tests
/
check_build.c
diff --git
a/tools/ccanlint/compulsory_tests/check_build.c
b/tools/ccanlint/compulsory_tests/check_build.c
index 2098f0d2a488212f2079e40ffc45d4ca48efe49e..5bdec5533f5920b09f54b42f3197e6fef9cd5bd5 100644
(file)
--- a/
tools/ccanlint/compulsory_tests/check_build.c
+++ b/
tools/ccanlint/compulsory_tests/check_build.c
@@
-27,9
+27,10
@@
static char *obj_list(const struct manifest *m)
struct ccan_file *i;
/* Other CCAN deps. */
struct ccan_file *i;
/* Other CCAN deps. */
- list_for_each(&m->dep_objs, i, list)
- list = talloc_asprintf_append(list, "%s ", i->name);
-
+ list_for_each(&m->dep_dirs, i, list) {
+ if (i->compiled)
+ list = talloc_asprintf_append(list, "%s ", i->compiled);
+ }
return list;
}
return list;
}
@@
-44,10
+45,12
@@
static char *lib_list(const struct manifest *m)
return ret;
}
return ret;
}
-static void *check_use_build(struct manifest *m, unsigned int *timeleft)
+static void *check_use_build(struct manifest *m,
+ bool keep,
+ unsigned int *timeleft)
{
char *contents;
{
char *contents;
- char *tmpfile
, *err
;
+ char *tmpfile;
int fd;
tmpfile = temp_file(m, ".c");
int fd;
tmpfile = temp_file(m, ".c");
@@
-70,10
+73,8
@@
static void *check_use_build(struct manifest *m, unsigned int *timeleft)
}
close(fd);
}
close(fd);
- if (!compile_and_link(m, tmpfile, ccan_dir, obj_list(m), "",
- lib_list(m), &err))
- return err;
- return NULL;
+ return compile_and_link(m, tmpfile, ccan_dir, obj_list(m), "",
+ lib_list(m), temp_file(m, ""));
}
static const char *describe_use_build(struct manifest *m, void *check_result)
}
static const char *describe_use_build(struct manifest *m, void *check_result)