diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2022-05-24 09:54:14 +0200 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2022-06-07 21:15:37 +0300 |
| commit | 5f813283c8760f664a725a2fdd77d7a7a0b21f54 (patch) | |
| tree | ac976f2d67d25068cdeee943636ab456852a3a18 /bpkg/pkg-build.cxx | |
| parent | 365fb95a4846fad3bf021dad1438c136b5de832e (diff) | |
Start work on loading configuration variables defaults
Diffstat (limited to 'bpkg/pkg-build.cxx')
| -rw-r--r-- | bpkg/pkg-build.cxx | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx index 6db6845..e450985 100644 --- a/bpkg/pkg-build.cxx +++ b/bpkg/pkg-build.cxx @@ -2874,15 +2874,15 @@ namespace bpkg ? dir_path (pdb.config) /= nm.string () : optional<dir_path> ()); - pkg.skeleton = package_skeleton (options, - pdb, - *ap, - pkg.config_vars, - (sp != nullptr && !pkg.disfigure - ? &sp->config_variables - : nullptr), - move (src_root), - move (out_root)); + pkg.skeleton = package_skeleton ( + options, + pdb, + *ap, + pkg.config_vars, + pkg.disfigure, + (sp != nullptr ? &sp->config_variables : nullptr), + move (src_root), + move (out_root)); } else l5 ([&]{trace << "resume " << pkg.available_name_version_db ();}); @@ -11616,9 +11616,8 @@ namespace bpkg pdb, *ap, move (p.config_vars), - (!p.disfigure - ? &sp->config_variables - : nullptr), + p.disfigure, + &sp->config_variables, move (src_root), move (out_root)), prereqs (), @@ -11660,9 +11659,8 @@ namespace bpkg pdb, *dap, move (p.config_vars), - (!p.disfigure - ? &sp->config_variables - : nullptr), + p.disfigure, + &sp->config_variables, move (src_root), move (out_root)), prereqs (), |