simplify FCC toolchain by using inheritance of new Toolchain._add_dependency_cpp_headers method

Author: lexming

easybuild/toolchains/fcc.py

@@ -40,39 +40,10 @@ class FCC(FujitsuCompiler):
     OPTIONAL = False
 
     # override in order to add an exception for the Fujitsu lang/tcsds module
-    def _add_dependency_variables(self, names=None, cpp=None, ld=None):
-        """ Add LDFLAGS and CPPFLAGS to the self.variables based on the dependencies
-            names should be a list of strings containing the name of the dependency
+    def _add_dependency_cpp_headers(self, dep_root, extra_dirs=None):
         """
-        cpp_paths = ['include']
-        ld_paths = ['lib64', 'lib']
-
-        if cpp is not None:
-            for p in cpp:
-                if p not in cpp_paths:
-                    cpp_paths.append(p)
-        if ld is not None:
-            for p in ld:
-                if p not in ld_paths:
-                    ld_paths.append(p)
-
-        if not names:
-            deps = self.dependencies
-        else:
-            deps = [{'name': name} for name in names if name is not None]
-
-        # collect software install prefixes for dependencies
-        roots = []
-        for dep in deps:
-            if dep.get('external_module', False):
-                # for software names provided via external modules, install prefix may be unknown
-                names = dep['external_module_metadata'].get('name', [])
-                roots.extend([root for root in self.get_software_root(names) if root is not None])
-            else:
-                roots.extend(self.get_software_root(dep['name']))
-
-        for root in roots:
-            # skip Fujitsu's 'lang/tcsds' module, including the top level include breaks vectorization in clang mode
-            if 'tcsds' not in root:
-                self.variables.append_subdirs("CPPFLAGS", root, subdirs=cpp_paths)
-            self.variables.append_subdirs("LDFLAGS", root, subdirs=ld_paths)
+        Append prepocessor paths for given dependency root directory
+        """
+        # skip Fujitsu's 'lang/tcsds' module, including the top level include breaks vectorization in clang mode
+        if "tcsds" not in dep_root:
+            super()._add_dependency_cpp_headers(dep_root, extra_dirs=extra_dirs)