From 9dadc037cdf49b8e6d869d4226e2afeadaa0780a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 28 Aug 2016 15:03:29 +0200
Subject: Factor library search/processing out to cc::common

---
 build2/cc/link | 64 ----------------------------------------------------------
 1 file changed, 64 deletions(-)

(limited to 'build2/cc/link')

diff --git a/build2/cc/link b/build2/cc/link
index 05f7c5a..52ad4a4 100644
--- a/build2/cc/link
+++ b/build2/cc/link
@@ -12,8 +12,6 @@
 
 #include <build2/rule>
 
-#include <build2/bin/target>
-
 #include <build2/cc/types>
 #include <build2/cc/common>
 
@@ -39,21 +37,6 @@ namespace build2
       perform_clean (action, target&) const;
 
     private:
-      friend class compile;
-
-      void
-      process_libraries (scope&,
-                         lorder,
-                         const dir_paths&,
-                         file&,
-                         bool,
-                         const function<bool (file&, bool)>&,
-                         const function<void (file*, const string&, bool)>&,
-                         const function<void (file&,
-                                              const string&,
-                                              bool,
-                                              bool)>&,
-                         bool = false) const;
       void
       append_libraries (strings&, file&, bool, scope&, lorder) const;
 
@@ -87,53 +70,6 @@ namespace build2
                               const string&,
                               timestamp,
                               bool) const;
-      file&
-      resolve_library (name,
-                       scope&,
-                       lorder,
-                       const dir_paths&,
-                       optional<dir_paths>&) const;
-
-      dir_paths
-      extract_library_dirs (scope&) const;
-
-      bool
-      pkgconfig_extract (scope&,
-                         bin::lib&,
-                         bin::liba*,
-                         bin::libs*,
-                         const string*,
-                         const string&,
-                         const dir_path&,
-                         const dir_paths&) const;
-
-      // Alternative search logic for VC (msvc.cxx).
-      //
-      bin::liba*
-      msvc_search_static (const process_path&,
-                          const dir_path&,
-                          const prerequisite_key&) const;
-
-      bin::libs*
-      msvc_search_shared (const process_path&,
-                          const dir_path&,
-                          const prerequisite_key&) const;
-
-      target*
-      search_library (const dir_paths& sysd,
-                      optional<dir_paths>& usrd,
-                      prerequisite& p) const
-      {
-        if (p.target == nullptr) // First check the cache.
-          p.target = search_library (sysd, usrd, p.key ());
-
-        return p.target;
-      }
-
-      target*
-      search_library (const dir_paths&,
-                      optional<dir_paths>&,
-                      const prerequisite_key&) const;
 
       // Windows-specific (windows-manifest.cxx).
       //
-- 
cgit v1.1