diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2022-01-11 14:41:22 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2022-01-17 18:43:24 +0300 |
| commit | 49755e15ae067471d7b6ccfbe9114951334f4aeb (patch) | |
| tree | 5703fba674dc5aee6a3df1987f8b275e4b25403d | |
| parent | c470e488b76818c8908d2e195f1b2a408c1b8b0d (diff) | |
Fix assertion in build_package::merge()
| -rw-r--r-- | bpkg/pkg-build.cxx | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx index df4c079..f78a96d 100644 --- a/bpkg/pkg-build.cxx +++ b/bpkg/pkg-build.cxx @@ -720,6 +720,11 @@ namespace bpkg // assert (action && *action != drop && (!p.action || *p.action != drop)); + // We never merge two repointed dependent reconfigurations. + // + assert ((flags & build_repoint) == 0 || + (p.flags & build_repoint) == 0); + // Copy the user-specified options/variables. // if (p.user_selection ()) @@ -780,17 +785,10 @@ namespace bpkg // flags |= p.flags; + // Upgrade repoint to the full build. + // if (*action == build) - { - // We never merge two repointed dependent reconfigurations. - // - assert ((flags & build_repoint) == 0 || - (p.flags & build_repoint) == 0); - - // Upgrade repoint to the full build. - // flags &= ~build_repoint; - } // Note that we don't copy the build_package::system flag. If it was // set from the command line ("strong system") then we will also have |