diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-02-22 20:29:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 20:29:28 +0200 |
| commit | 2f21e1ffc06ca41dac132018e8bef5bd2fe95ab1 (patch) | |
| tree | 348615e4c228a98afe0318a6cd7c7eb95d3f7eb6 /mesonbuild/dependencies/base.py | |
| parent | 56c6489a6cc5879186999dbdab0e54c51210c2f2 (diff) | |
| parent | 0097ce4c4ed872aee9e8cd58b6981b4cfd62e089 (diff) | |
| download | meson-2f21e1ffc06ca41dac132018e8bef5bd2fe95ab1.zip meson-2f21e1ffc06ca41dac132018e8bef5bd2fe95ab1.tar.gz meson-2f21e1ffc06ca41dac132018e8bef5bd2fe95ab1.tar.bz2 | |
Merge pull request #3060 from jon-turney/always-run-framework-tests
Always run all framework tests on all platforms
Diffstat (limited to 'mesonbuild/dependencies/base.py')
| -rw-r--r-- | mesonbuild/dependencies/base.py | 8 |
1 files changed, 7 insertions, 1 deletions
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)) |