Fix version parsing to allow linker category

Author: lukehoffmann

Diff for: source/fab/tools/compiler.py

@@ -335,7 +335,6 @@ def parse_version_output(self, category: Category,
         '''
         Extract the numerical part from a GNU compiler's version output
 
-        :param name: the compiler's name
         :param category: the compiler's Category
         :param version_output: the full version output from the compiler
         :returns: the actual version as a string
@@ -404,7 +403,7 @@ def parse_version_output(self, category: Category,
         '''
         Extract the numerical part from an Intel compiler's version output
 
-        :param name: the compiler's name
+        :param category: the compiler's Category
         :param version_output: the full version output from the compiler
         :returns: the actual version as a string
 

Diff for: source/fab/tools/compiler_wrapper.py

@@ -41,14 +41,31 @@ def __init__(self, name: str, exec_name: str,
             suite=self._compiler.suite,
             mpi=mpi,
             availability_option=self._compiler.availability_option)
-        # We need to have the right version to parse the version output
-        # So we set this function based on the function that the
-        # wrapped compiler uses:
-        setattr(self, "parse_version_output", compiler.parse_version_output)
 
     def __str__(self):
         return f"{type(self).__name__}({self._compiler.name})"
 
+    # We need to have the right version to parse the version output
+    # So we set this function based on the function that the
+    # wrapped compiler uses:
+    def parse_version_output(self, _: Category, version_output: str) -> str:
+        """
+        Extract the numerical part from a GNU compiler's version output
+
+        Overridden to use the wrapped compiler's version of the function, and
+        pass in the wrapped compiler's category, since the category of this
+        wrapper might be different.
+
+        :param category: the compiler's Category
+        :param version_output: the full version output from the compiler
+        :returns: the actual version as a string
+
+        :raises RuntimeError: if the output is not in an expected format.
+        """
+
+        return self.compiler.parse_version_output(
+            self.compiler.category, version_output)
+
     def get_version(self) -> Tuple[int, ...]:
         """
         :returns: a tuple of at least 2 integers, representing the version