From e85e618a1b918f7279133eb1f446c1af871f5dd2 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 3 Dec 2020 11:00:24 +0200 Subject: Fix modules support for installed libraries --- libbuild2/cc/pkgconfig.cxx | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'libbuild2/cc/pkgconfig.cxx') diff --git a/libbuild2/cc/pkgconfig.cxx b/libbuild2/cc/pkgconfig.cxx index bbcddf9..35ba2d8 100644 --- a/libbuild2/cc/pkgconfig.cxx +++ b/libbuild2/cc/pkgconfig.cxx @@ -1209,6 +1209,11 @@ namespace build2 // liba{} would require weeding out duplicates that are already in // lib{}. // + // Currently, this information is only used by the modules machinery to + // resolve module names to module files (but we cannot only do this if + // modules are enabled since the same installed library can be used by + // multiple builds). + // prerequisites prs; pkgconf apc; @@ -1262,8 +1267,8 @@ namespace build2 parse_cflags (*st, spc, false); // For now we assume static and shared variants export the same set of - // modules. While technically possible, having a different set will - // most likely lead to all sorts of trouble (at least for installed + // modules. While technically possible, having a different set will most + // likely lead to all sorts of complications (at least for installed // libraries) and life is short. // if (modules) @@ -1272,12 +1277,6 @@ namespace build2 assert (!lt.has_prerequisites ()); if (!prs.empty ()) lt.prerequisites (move (prs)); - - // Bless the library group with a "trust me it exists" timestamp. Failed - // that, if we add it as a prerequisite (like we do above), the fallback - // file rule won't match. - // - lt.mtime (mtime (ipc.path)); } #else -- cgit v1.1