diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-09-06 15:59:36 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-09-06 15:59:36 +0200 |
| commit | 86f59ed0ab4236deef4e56035140ff5c97cfa6b2 (patch) | |
| tree | bfdea2b93bb237863282e15a6c23b341083303a0 | |
| parent | 3944dea331b1d5840e45abcbea0572ddcdf80332 (diff) | |
Don't search for subprojects recursively, only at top-level
| -rw-r--r-- | build/bootstrap.build | 1 | ||||
| -rw-r--r-- | build2/file.cxx | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/build/bootstrap.build b/build/bootstrap.build index 32376c7..134bc11 100644 --- a/build/bootstrap.build +++ b/build/bootstrap.build @@ -3,7 +3,6 @@ # license : MIT; see accompanying LICENSE file project = build2 -subprojects = # No subprojects. using build@0.4.0 diff --git a/build2/file.cxx b/build2/file.cxx index 46362e1..bf1c4d8 100644 --- a/build2/file.cxx +++ b/build2/file.cxx @@ -400,7 +400,13 @@ namespace build2 bool src (false); if (!((out && is_out_root (sd)) || (src = is_src_root (sd)))) { - find_subprojects (sps, sd, root, out); + // We used to scan for subproject recursively but this is probably too + // loose (think of some tests laying around). In the future we should + // probably allow specifying something like extra/* or extra/** in + // subprojects. + // + //find_subprojects (sps, sd, root, out); + // continue; } |