From 2f6b7875d4f776a3cf68ee0ec6d4410539af953e Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Feb 2018 14:22:36 +0000 Subject: Fix for test cases/frameworks/17 mpi on Cygwin Unusually, the cygwin package for openmpi installs headers into /usr/include, rather than /usr/include/openmpi Prevent pkg-config from suppressing that -I flag, so a gfortran INCLUDE can find those files --- mesonbuild/dependencies/base.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'mesonbuild') diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 3357e8e..7a652a4 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -495,7 +495,13 @@ class PkgConfigDependency(ExternalDependency): return converted def _set_cargs(self): - ret, out = self._call_pkgbin(['--cflags', self.name]) + env = None + 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 = self._call_pkgbin(['--cflags', self.name], env=env) if ret != 0: raise DependencyException('Could not generate cargs for %s:\n\n%s' % (self.name, out)) -- cgit v1.1