From f5be99eb78afe8da70287083384f9c122f5d8644 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 5 Jun 2023 13:03:42 +0200 Subject: Don't use wildcards for subprojects to allow stray subdirectories in root --- build/bootstrap.build | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'build') 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 -- cgit v1.1