From 074a8c04a384a9752466bd2af69b695333b2955c Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 29 Nov 2017 17:44:48 +0200 Subject: Reimplement module sidebuilding using an ad hoc subproject --- build2/b.cxx | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'build2/b.cxx') diff --git a/build2/b.cxx b/build2/b.cxx index 94c6279..9ad21bc 100644 --- a/build2/b.cxx +++ b/build2/b.cxx @@ -702,17 +702,18 @@ main (int argc, char* argv[]) src_root = out_root; } - // Now we know out_root and, if it was explicitly specified - // or the same as out_root, src_root. The next step is to - // create the root scope and load the out_root bootstrap - // files, if any. Note that we might already have done this - // as a result of one of the preceding target processing. + // Now we know out_root and, if it was explicitly specified or the + // same as out_root, src_root. The next step is to create the root + // scope and load the out_root bootstrap files, if any. Note that we + // might already have done this as a result of one of the preceding + // target processing. // - // If we know src_root, set that variable as well. This could - // be of use to the bootstrap files (other than src-root.build, - // which, BTW, doesn't need to exist if src_root == out_root). + // If we know src_root, set that variable as well. This could be of + // use to the bootstrap files (other than src-root.build, which, + // BTW, doesn't need to exist if src_root == out_root). // - scope& rs (create_root (*scope::global_, out_root, src_root)); + scope& rs ( + create_root (*scope::global_, out_root, src_root)->second); bool bootstrapped (build2::bootstrapped (rs)); -- cgit v1.1