Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(common): calculate already-built dependency targets correctly #11477

Merged
merged 1 commit into from
May 20, 2024
+7 −7
Merged

fix(common): calculate already-built dependency targets correctly #11477

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions resources/builder.inc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1682,26 +1682,26 @@ _builder_do_build_deps() {
continue
fi

# Only configure and build the dependency once per invocation
if builder_has_module_been_built "$dep"; then
continue
fi

dep_target=
if [[ ! -z ${_builder_dep_targets[$dep]+x} ]]; then
# TODO: in the future split _builder_dep_targets into comma-separated
# array for multiple targets for a dep?
dep_target=${_builder_dep_targets[$dep]}
fi

builder_set_module_has_been_built "$dep"
# Only configure and build the dependency once per invocation
if builder_has_module_been_built "$dep$dep_target"; then
continue
fi

builder_set_module_has_been_built "$dep$dep_target"
"$REPO_ROOT/$dep/build.sh" "configure$dep_target" "build$dep_target" \
$builder_verbose \
$builder_debug \
$_builder_build_deps \
--builder-dep-parent "$THIS_SCRIPT_IDENTIFIER" && (
if $_builder_debug_internal; then
builder_echo success "## Dependency $dep for $_builder_matched_action_name successfully"
builder_echo success "## Dependency $dep$dep_target for $_builder_matched_action_name successfully"
fi
) || (
result=$?
Expand Down
Loading