Attempt to make Unix and Windows use the same code for get_link_args( ).

1 files changed, 5 insertions, 17 deletions

diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index 4639db86c..542de39b6 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -432,26 +432,14 @@ class BoostDependency(ExternalDependency):
                 if modname not in self.lib_modules:
                     self.lib_modules[modname] = [entry]
 
-    def get_win_link_args(self):
-        args = []
-        # TODO: should this check self.libdir?
-        if self.libdir:
-            args += self.compiler.get_linker_search_args(self.libdir)
-        for lib in self.requested_modules:
-            args += self.lib_modules['boost_' + lib]
-        return args
-
     def extra_lib_dirs(self):
-        dirs = []
-        if self.boost_root:
-            dirs = [os.path.join(self.boost_root, 'lib')]
-        elif self.libdir:
-            dirs = [self.libdir]
-        return dirs
+        if self.libdir:
+            return [self.libdir]
+        elif self.boost_root:
+            return [os.path.join(self.boost_root, 'lib')]
+        return []
 
     def get_link_args(self):
-        if mesonlib.is_windows():
-            return self.get_win_link_args()
         args = []
         for dir in self.extra_lib_dirs():
             args += self.compiler.get_linker_search_args(self.libdir)