From 6ad4a629e0a790ad60352a94ea25359f38700b2f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 27 Aug 2018 20:23:06 +0200
Subject: Don't insist on install rules for non-file targets

This helps with (not) installing libu*{} groups.
---
 build2/cc/compile-rule.cxx | 2 +-
 build2/cc/install-rule.cxx | 4 ++--
 build2/cc/install-rule.hxx | 6 +++---
 build2/cc/pkgconfig.cxx    | 2 +-
 build2/cc/types.hxx        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'build2/cc')

diff --git a/build2/cc/compile-rule.cxx b/build2/cc/compile-rule.cxx
index ebd12fd..7a50170 100644
--- a/build2/cc/compile-rule.cxx
+++ b/build2/cc/compile-rule.cxx
@@ -3596,7 +3596,7 @@ namespace build2
               // available.
               //
               // @@ MOD: BMI compatibility check.
-              // @@ UTL: we need to (recursively) see through libux{} (and
+              // @@ UTL: we need to (recursively) see through libu*{} (and
               //    also in pkgconfig_save()).
               //
               if (bt->is_a<bmix> ())
diff --git a/build2/cc/install-rule.cxx b/build2/cc/install-rule.cxx
index 9e6b93f..d687903 100644
--- a/build2/cc/install-rule.cxx
+++ b/build2/cc/install-rule.cxx
@@ -64,8 +64,8 @@ namespace build2
         if ((st && pt->is_a<libs> ()) || (at && pt->is_a<liba> ()))
           return pt->in (t.weak_scope ()) ? pt : nullptr;
 
-        // See through libux{}. Note that we are always in the same project
-        // (and thus amalgamation).
+        // See through to libu*{} members. Note that we are always in the same
+        // project (and thus amalgamation).
         //
         if (pt->is_a<libux> ())
           return pt;
diff --git a/build2/cc/install-rule.hxx b/build2/cc/install-rule.hxx
index 25d2d08..ecca702 100644
--- a/build2/cc/install-rule.hxx
+++ b/build2/cc/install-rule.hxx
@@ -53,9 +53,9 @@ namespace build2
 
     // Installation rule for libu*{}.
     //
-    // While libu*{} themselves are not installable, we need to see through
-    // them in case they depend on stuff that we need to install (e.g.,
-    // headers). Note that we use the alias_rule as a base.
+    // While libu*{} members themselves are not installable, we need to see
+    // through them in case they depend on stuff that we need to install
+    // (e.g., headers). Note that we use the alias_rule as a base.
     //
     class libux_install_rule: public install::alias_rule, virtual common
     {
diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx
index d331f7e..4a8d995 100644
--- a/build2/cc/pkgconfig.cxx
+++ b/build2/cc/pkgconfig.cxx
@@ -1345,7 +1345,7 @@ namespace build2
 
           for (const target* pt: l.prerequisite_targets[a])
           {
-            // @@ UTL: we need to (recursively) see through libux{} (and
+            // @@ UTL: we need to (recursively) see through libu*{} (and
             //    also in search_modules()).
             //
             if (pt != nullptr && pt->is_a<bmix> ())
diff --git a/build2/cc/types.hxx b/build2/cc/types.hxx
index d50c067..db12356 100644
--- a/build2/cc/types.hxx
+++ b/build2/cc/types.hxx
@@ -96,7 +96,7 @@ namespace build2
     //
     using lflags = uintptr_t; // To match prerequisite_target::data.
 
-    const lflags lflag_whole = 0x00000001U; // Link whole liba{}/libux{}.
+    const lflags lflag_whole = 0x00000001U; // Link whole liba{}/libu*}.
   }
 }
 
-- 
cgit v1.1