aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bpkg/package-configuration.hxx2
-rw-r--r--bpkg/package-skeleton.cxx12
2 files changed, 12 insertions, 2 deletions
diff --git a/bpkg/package-configuration.hxx b/bpkg/package-configuration.hxx
index 6995857..0229f31 100644
--- a/bpkg/package-configuration.hxx
+++ b/bpkg/package-configuration.hxx
@@ -4,8 +4,6 @@
#ifndef BPKG_PACKAGE_CONFIGURATION_HXX
#define BPKG_PACKAGE_CONFIGURATION_HXX
-#include <map>
-
#include <libbuild2/types.hxx> // build2::names
#include <libbuild2/config/types.hxx> // build2::config::variable_origin
diff --git a/bpkg/package-skeleton.cxx b/bpkg/package-skeleton.cxx
index b565bc1..c53421b 100644
--- a/bpkg/package-skeleton.cxx
+++ b/bpkg/package-skeleton.cxx
@@ -2684,7 +2684,19 @@ namespace bpkg
if (!v)
v = src_root;
else
+ {
+ // If the package directory was moved, then it's possible we will have
+ // bootstrap.build with an old src_root value. Presumably this will
+ // cause the package to be re-configured and so ignoring the old value
+ // here should be ok.
+ //
+#if 0
assert (cast<dir_path> (v) == src_root);
+#else
+ if (cast<dir_path> (v) != src_root)
+ v = src_root;
+#endif
+ }
setup_root (rs, false /* forwarded */);