From 942d2c8f93fe664ab275b626af3e5d5266862e3a Mon Sep 17 00:00:00 2001 From: Meagan Lang Date: Tue, 20 Feb 2024 12:46:46 -0500 Subject: [PATCH] Explicitly set the compatible tools set priority order on windows --- yggdrasil/drivers/FortranModelDriver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yggdrasil/drivers/FortranModelDriver.py b/yggdrasil/drivers/FortranModelDriver.py index a3dafc0c4..dd4810d0d 100644 --- a/yggdrasil/drivers/FortranModelDriver.py +++ b/yggdrasil/drivers/FortranModelDriver.py @@ -102,7 +102,7 @@ class GFortranCompiler(FortranCompilerBase): ('module-search-path', '-I%s'), ('standard', '-std=%s')]) toolset = 'gnu' - compatible_toolsets = ['msvc', 'llvm'] + compatible_toolsets = ['llvm', 'msvc'] default_archiver = 'ar' # GNU ASAN not currently installed with gfortran on osx # asan_flags = ['-fsanitize=address'] @@ -119,8 +119,8 @@ def before_registration(cls, **kwargs): """ # Put gnu at end of compatible toolset list on windows so that # msvc libraries are preferred (Python assumes MSVC) - if platform._is_win and cls.toolset not in cls.compatible_toolsets: - cls.compatible_toolsets.append(cls.toolset) + if platform._is_win: + cls.compatible_toolsets = ['msvc', 'cl', 'llvm'] FortranCompilerBase.before_registration(cls, **kwargs)