Handle bin.whole when specified for interface dependencies

2 files changed, 29 insertions, 11 deletions

diff --git a/libbuild2/bin/init.cxx b/libbuild2/bin/init.cxx
index 78119cb..c5b58bb 100644
--- a/libbuild2/bin/init.cxx
+++ b/libbuild2/bin/init.cxx
@@ -107,12 +107,12 @@ namespace build2
       // Link whole archive. Note: with target visibility.
       //
       // The lookup semantics is as follows: we first look for a prerequisite-
-      // specific value, then for a target-specific value in the library being
-      // linked, and then for target type/pattern-specific value starting from
-      // the scope of the target being linked-to. In that final lookup we do
-      // not look in the target being linked-to itself since that is used to
-      // indicate how this target should be linked to other targets. For
-      // example:
+      // specific value, then for a target-specific value in the prerequisite
+      // library, and then for target type/pattern-specific value starting
+      // from the scope of the target being linked. In that final lookup we do
+      // not look in the target being linked itself since that is used to
+      // indicate how this target should be used as a prerequisite of other
+      // targets. For example:
       //
       // exe{test}: liba{foo}
       // liba{foo}: libua{foo1 foo2}
diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx
index a250e2a..3eaa523 100644
--- a/libbuild2/cc/common.cxx
+++ b/libbuild2/cc/common.cxx
@@ -408,7 +408,7 @@ namespace build2
               if (!li) find_linfo ();
 
               process_libraries_impl (a, bs, *li, *sysd,
-                                      g, *f, la, pt.data,
+                                      g, *f, la, pt.data /* lflags */,
                                       proc_impl, proc_lib, proc_opt,
                                       true /* self */, proc_opt_group,
                                       cache, chain, nullptr);
@@ -647,13 +647,31 @@ namespace build2
 
                 // Process it recursively.
                 //
-                // @@ Where can we get the link flags? Should we try to find
-                //    them in the library's prerequisites? What about
-                //    installed stuff?
+                bool u;
+                bool la ((u = t->is_a<libux> ()) || t->is_a<liba> ());
+                lflags lf (0);
+
+                // If this is a static library, see if we need to link it
+                // whole.
                 //
+                if (la && proc_lib)
+                {
+                  // Note: go straight for the public variable pool.
+                  //
+                  const variable& var (t->ctx.var_pool["bin.whole"]);
+
+                  // See the link rule for the lookup semantics.
+                  //
+                  lookup l (
+                    t->lookup_original (var, true /* target_only */).first);
+
+                  if (l ? cast<bool> (*l) : u)
+                    lf |= lflag_whole;
+                }
+
                 process_libraries_impl (
                   a, bs, *li, *sysd,
-                  g, *t, t->is_a<liba> () || t->is_a<libux> (), 0,
+                  g, *t, la, lf,
                   proc_impl, proc_lib, proc_opt,
                   true /* self */, proc_opt_group,
                   cache, chain, dedup);