PkgConfigDependency: Move CLI handling into its own abstraction

This makes the code cleaner and will allow to have other implementations
in the future.

1 files changed, 4 insertions, 12 deletions

diff --git a/mesonbuild/dependencies/scalapack.py b/mesonbuild/dependencies/scalapack.py
index 2442ede..fc2f720 100644
--- a/mesonbuild/dependencies/scalapack.py
+++ b/mesonbuild/dependencies/scalapack.py
@@ -20,7 +20,6 @@ import typing as T
 
 from ..mesonlib import OptionKey
 from .base import DependencyMethods
-from .base import DependencyException
 from .cmake import CMakeDependency
 from .detect import packages
 from .pkgconfig import PkgConfigDependency
@@ -144,17 +143,10 @@ class MKLPkgConfigDependency(PkgConfigDependency):
             self.link_args.insert(i + 1, '-lmkl_blacs_intelmpi_lp64')
 
     def _set_cargs(self) -> None:
-        env = None
+        allow_system = False
         if self.language == 'fortran':
             # gfortran doesn't appear to look in system paths for INCLUDE files,
             # so don't allow pkg-config to suppress -I flags for system paths
-            env = os.environ.copy()
-            env['PKG_CONFIG_ALLOW_SYSTEM_CFLAGS'] = '1'
-        ret, out, err = self._call_pkgbin([
-            '--cflags', self.name,
-            '--define-variable=prefix=' + self.__mklroot.as_posix()],
-            env=env)
-        if ret != 0:
-            raise DependencyException('Could not generate cargs for %s:\n%s\n' %
-                                      (self.name, err))
-        self.compile_args = self._convert_mingw_paths(self._split_args(out))
+            allow_system = True
+        cflags = self.pkgconfig.cflags(self.name, allow_system, define_variable=['prefix', self.__mklroot.as_posix()])
+        self.compile_args = self._convert_mingw_paths(cflags)