aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2023-06-05 13:03:42 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2023-06-05 13:10:31 +0200
commitf5be99eb78afe8da70287083384f9c122f5d8644 (patch)
tree13c359ad27d00a274293879fe865d8d21252935e /build
parentbf4a03ac20d868b347be8174fe4edd64f77d6645 (diff)
Don't use wildcards for subprojects to allow stray subdirectories in root
Diffstat (limited to 'build')
-rw-r--r--build/bootstrap.build9
1 files changed, 8 insertions, 1 deletions
diff --git a/build/bootstrap.build b/build/bootstrap.build
index 7d4dccc..183578f 100644
--- a/build/bootstrap.build
+++ b/build/bootstrap.build
@@ -2,8 +2,15 @@
# license : MIT; see accompanying LICENSE file
project = build2-toolchain
+
amalgamation = # Disable amalgamation.
-subprojects = {*/ -build/ -doc/ -tests/ -submodules/}
+
+# Note: list them (mostly) explicitly without using wildcards to handle stray
+# subdirectories in the root (debian/, installation location, etc).
+#
+subprojects += libpkg-config/ libbutl/ build2/ libsqlite3/ libodb/ \
+ libodb-sqlite/ libbpkg/ bpkg/ bdep/
+subprojects += libbuild2-*/
subprojects += tests/*/
using version