From 92697b523aa53d233c7ddd43c88d38f558fcd3bd Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 16 Jun 2022 15:43:45 +0300 Subject: Fix failing for outdated src-root.build --- bpkg/package-skeleton.cxx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'bpkg/package-skeleton.cxx') diff --git a/bpkg/package-skeleton.cxx b/bpkg/package-skeleton.cxx index 96c93aa..2ca06cc 100644 --- a/bpkg/package-skeleton.cxx +++ b/bpkg/package-skeleton.cxx @@ -2688,14 +2688,17 @@ namespace bpkg // 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. + // here should be ok. Also let's remove the outdated bootstrap.build + // in this case, so it doesn't affect us down the road. // -#if 0 - assert (cast (v) == src_root); -#else if (cast (v) != src_root) + { v = src_root; -#endif + + assert (altn); // Since bootstrap.build has been found. + + rm (out_root / (*altn ? alt_src_root_file : std_src_root_file)); + } } setup_root (rs, false /* forwarded */); -- cgit v1.1