static char *obj_list(const struct manifest *m)
{
- char *list = talloc_strdup(m, "");
+ char *list;
struct manifest *i;
+ if (m->compiled[COMPILE_NORMAL])
+ list = talloc_strdup(m, m->compiled[COMPILE_NORMAL]);
+ else
+ list = talloc_strdup(m, "");
+
/* Other CCAN deps. */
list_for_each(&m->deps, i, list) {
if (i->compiled[COMPILE_NORMAL])
- list = talloc_asprintf_append(list, "%s ",
+ list = talloc_asprintf_append(list, " %s",
i->compiled
[COMPILE_NORMAL]);
}
}
static void check_use_build(struct manifest *m,
- bool keep,
unsigned int *timeleft, struct score *score)
{
char *contents;
char *basename = talloc_asprintf(m, "%s/example.c", m->dir);
int fd;
- tmpfile = maybe_temp_file(m, ".c", keep, basename);
+ tmpfile = temp_file(m, ".c", basename);
fd = open(tmpfile, O_WRONLY | O_CREAT | O_EXCL, 0600);
if (fd < 0)
if (compile_and_link(score, tmpfile, ccan_dir, obj_list(m),
compiler, cflags, lib_list(m),
- maybe_temp_file(m, "", keep, tmpfile),
+ temp_file(m, "", tmpfile),
&cmdout)) {
score->pass = true;
score->score = score->total;