Skip to content

Commit

Permalink
track raw target order_deps
Browse files Browse the repository at this point in the history
  • Loading branch information
annacrombie committed Dec 17, 2024
1 parent ca88a55 commit 1582927
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions include/lang/object.h
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ struct build_dep {

struct {
obj deps;
obj order_deps;
obj link_with;
obj link_whole;
} raw;
Expand Down
5 changes: 5 additions & 0 deletions src/functions/kernel/build_target.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,11 @@ process_source_include(struct workspace *wk, struct process_build_tgt_sources_ct
struct obj_build_target *tgt = get_obj_build_target(wk, ctx->tgt_id);
obj_array_push(wk, tgt->dep_internal.order_deps, sbuf_into_str(wk, &path));

if (!tgt->dep_internal.raw.order_deps) {
make_obj(wk, &tgt->dep_internal.raw.order_deps, obj_array);
}
obj_array_push(wk, tgt->dep_internal.raw.order_deps, val);

if (!ctx->implicit_include_directories) {
return true;
}
Expand Down
1 change: 1 addition & 0 deletions src/functions/kernel/dependency.c
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,7 @@ dedup_build_dep(struct workspace *wk, struct build_dep *dep)
obj_array_dedup_in_place(wk, &dep->link_whole);
obj_array_dedup_in_place(wk, &dep->frameworks);
obj_array_dedup_in_place(wk, &dep->raw.deps);
obj_array_dedup_in_place(wk, &dep->raw.order_deps);
obj_array_dedup_in_place(wk, &dep->raw.link_with);
obj_array_dedup_in_place(wk, &dep->raw.link_whole);
obj_array_dedup_in_place(wk, &dep->include_directories);
Expand Down

0 comments on commit 1582927

Please sign in to comment.