From 0a51fd1f95b4da63d30a1f82fee8ee0eb8d889ca Mon Sep 17 00:00:00 2001 From: Meagan Lang Date: Tue, 28 May 2024 17:59:19 -0400 Subject: [PATCH] Fix bug introduced by always including libraries --- yggdrasil/drivers/CMakeModelDriver.py | 3 +-- yggdrasil/drivers/CompiledModelDriver.py | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yggdrasil/drivers/CMakeModelDriver.py b/yggdrasil/drivers/CMakeModelDriver.py index 8463ab1ff..2000510e8 100644 --- a/yggdrasil/drivers/CMakeModelDriver.py +++ b/yggdrasil/drivers/CMakeModelDriver.py @@ -880,8 +880,7 @@ def create_exports(cls, dep, products=None, overwrite=False, f'{dep.name}{suffix}Targets.cmake') dependencies = dep.dependency_order() dep_kws = {'dry_run': True} - dependencies.getall('dep_kwargs', to_update=dep_kws, - dep_libtype=dep['libtype']) + dependencies.getall('dep_kwargs', to_update=dep_kws) if dep.result in dep_kws.get('libraries', []): dep_kws['libraries'].remove(dep.result) lines = [ diff --git a/yggdrasil/drivers/CompiledModelDriver.py b/yggdrasil/drivers/CompiledModelDriver.py index b7d3791c8..c89b32730 100644 --- a/yggdrasil/drivers/CompiledModelDriver.py +++ b/yggdrasil/drivers/CompiledModelDriver.py @@ -3474,7 +3474,8 @@ def _dep_libtool_kwargs(self, key, to_update=None, dep_libtype=None, if not os.path.isfile(dep_lib): raise RuntimeError(f"Library for {self.name} dependency " f"does not exist: '{dep_lib}'.") - if self['libtype'] in self.library_files: + if ((self['libtype'] in self.library_files + and dep_libtype != 'static')): libkey = 'libraries' if use_library_path_internal and self.origin == 'internal': if to_update.get('skip_library_libs', False):