diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2024-04-30 15:01:29 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2024-04-30 15:01:29 +0200 |
commit | f9cda8a43f7ef65a75a84e0c2a11241916d25250 (patch) | |
tree | d165e92545261be9937c6b4ba5d1d7d0ab316cee /odb | |
parent | 2a8ca82757ddaafe72137171f560c12e6d009f1e (diff) |
Remove old cruft (libtool support, etc) from plugin search code
Diffstat (limited to 'odb')
-rw-r--r-- | odb/odb/odb.cxx | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/odb/odb/odb.cxx b/odb/odb/odb.cxx index 2b7022c..2f2a75d 100644 --- a/odb/odb/odb.cxx +++ b/odb/odb/odb.cxx @@ -1617,9 +1617,7 @@ plugin_path (path const& drv, #endif // Figure out the plugin base name which is just the driver name (but - // without the .exe extension on Windows). If the driver name starts with - // 'lt-', then we are running through the libtool script. Strip this prefix - // -- the shared object should be in the same directory. + // without the .exe extension on Windows). // #ifdef _WIN32 string b (drv.leaf ().base ().string ()); @@ -1627,10 +1625,6 @@ plugin_path (path const& drv, string b (drv.leaf ().string ()); #endif - bool lt (b.size () > 3 && b[0] == 'l' && b[1] == 't' && b[2] == '-'); - if (lt) - b = string (b, 3, string::npos); - path dp (driver_path (drv)); if (dp.empty ()) @@ -1642,19 +1636,7 @@ plugin_path (path const& drv, dp = dp.directory (); struct stat info; - // Regardless of whether we were given a plugin path, first try - // the current directory for the .la file. This will make sure - // running ODB from the build directory works as expected. - // - // @@ BUILD2: not going to work for build2 build. - // - path pp (dp / path (b + ".la")); - if (stat (pp.string ().c_str (), &info) == 0) - { - pp = dp / path (".libs") / path (b + ".so"); - if (stat (pp.string ().c_str (), &info) == 0) - return pp; - } + path pp; #ifdef ODB_GCC_PLUGIN_DIR // Plugin should be installed into the GCC default plugin directory. @@ -1663,9 +1645,9 @@ plugin_path (path const& drv, // was only added in GCC 4.6 so in order to support 4.5 we will have to // emulate it ourselves. // - if (!lt) + //@@ TMP: drop this after 2.5.0 since we no longer support GCC < 5. + // { - //@@ BUILD2: if/when dropping old GCC should just get rid of this. #if 1 // First get the default GCC plugin directory. // @@ -1715,10 +1697,8 @@ plugin_path (path const& drv, #endif } #elif defined (ODB_PLUGIN_PATH) - // If we were given a plugin path, use that unless we are running - // via libtool. + // If we were given a plugin path, use that. // - if (!lt) { string rp (ODB_PLUGIN_PATH); if (!rp.empty ()) |