Redo build_installed without requiring linking whole archive

1 files changed, 7 insertions, 10 deletions

diff --git a/libbuild2/buildfile b/libbuild2/buildfile
index c496c52..3ad2f9b 100644
--- a/libbuild2/buildfile
+++ b/libbuild2/buildfile
@@ -9,19 +9,15 @@
 
 import int_libs = libbutl%lib{butl}
 
-# Note that this won't work on libul{} since it's never installed.
-#
-lib{build2}: cxx{utility-installed}: for_install = true
-
-# @@ TMP
-#liba{build2}: bin.whole = true # See utility-installed.cxx.
-
-# Keep dependency on libul{build2} after cxx{utility-installed}.
-#
 lib{build2}: libul{build2}:                                            \
-  {hxx ixx txx cxx}{* -utility-installed -config -version -*.test...} \
+  {hxx ixx txx cxx}{* -utility-*installed -config -version -*.test...} \
   {hxx}{config version}
 
+# Note that this won't work in libul{} since it's not installed.
+#
+lib{build2}: cxx{utility-installed}:   for_install = true
+lib{build2}: cxx{utility-uninstalled}: for_install = false
+
 # These are "core modules" that come bundled with libbuild2 (see also unit
 # tests loop below). Note that the build system core can still function
 # without them or with their alternative implementations.
@@ -69,6 +65,7 @@ for t:         cxx{ *.test...} \
 
   ./: $d/exe{$n}: $t $d/{hxx ixx txx}{+$n} $d/testscript{+$n +$b+*.test...}
   $d/exe{$n}: libul{build2}: bin.whole = false
+  $d/exe{$n}: cxx{utility-uninstalled}
 }
 
 # Build options.