aboutsummaryrefslogtreecommitdiff
path: root/bpkg/pkg-configure.cxx
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2022-05-19 14:24:18 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2022-06-07 21:14:14 +0300
commit141dd9fe0f04fab25c8bda8d831c818b62a6dbb0 (patch)
treedc273475fbd7466b8ac1f4740782ebebd6c895e9 /bpkg/pkg-configure.cxx
parent5754ef6aca5ccab95476a159a1da7b41effdd03d (diff)
Pass config variables sources to skeleton constructor
Diffstat (limited to 'bpkg/pkg-configure.cxx')
-rw-r--r--bpkg/pkg-configure.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/bpkg/pkg-configure.cxx b/bpkg/pkg-configure.cxx
index 49570c2..e2ecacb 100644
--- a/bpkg/pkg-configure.cxx
+++ b/bpkg/pkg-configure.cxx
@@ -591,6 +591,10 @@ namespace bpkg
? dir_path (db.config) /= p->name.string ()
: optional<dir_path> ());
+ // Note that the package could have been disfigured with --keep-config.
+ // Thus, we always pass config variables it may store to the package
+ // skeleton.
+ //
pkg_configure (o,
db,
t,
@@ -601,6 +605,7 @@ namespace bpkg
db,
*ap,
move (vars),
+ &p->config_variables,
move (src_root),
move (out_root)),
nullptr /* prerequisites */,