diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-05-02 14:54:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 14:54:02 -0700 |
| commit | c0aa89e57ff5a92c1a1e2cf542692f54622d8cd2 (patch) | |
| tree | febe385c372b2a1009be83be16528a892df60de5 /mesonbuild/dependencies | |
| parent | ae9a6417fe8158573801e10b84906931facb8112 (diff) | |
| parent | c61ae46461bf9f4c7afef2381032ac0cb2d26043 (diff) | |
| download | meson-c0aa89e57ff5a92c1a1e2cf542692f54622d8cd2.zip meson-c0aa89e57ff5a92c1a1e2cf542692f54622d8cd2.tar.gz meson-c0aa89e57ff5a92c1a1e2cf542692f54622d8cd2.tar.bz2 | |
Merge pull request #4952 from mensinda/cacheCompiles
Cache compilers.compile() in coredata
Diffstat (limited to 'mesonbuild/dependencies')
| -rw-r--r-- | mesonbuild/dependencies/boost.py | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 4 | ||||
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py index 381824c..f5b95f5 100644 --- a/mesonbuild/dependencies/boost.py +++ b/mesonbuild/dependencies/boost.py @@ -250,7 +250,7 @@ class BoostDependency(ExternalDependency): def detect_headers_and_version(self): try: - version = self.clib_compiler.get_define('BOOST_LIB_VERSION', '#include <boost/version.hpp>', self.env, self.get_compile_args(), []) + version = self.clib_compiler.get_define('BOOST_LIB_VERSION', '#include <boost/version.hpp>', self.env, self.get_compile_args(), [], disable_cache=True)[0] except mesonlib.EnvironmentException: return except TypeError: diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 55cb569..72ba7b3 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -368,7 +368,7 @@ class OpenMPDependency(ExternalDependency): self.is_found = False try: openmp_date = self.clib_compiler.get_define( - '_OPENMP', '', self.env, self.clib_compiler.openmp_flags(), [self]) + '_OPENMP', '', self.env, self.clib_compiler.openmp_flags(), [self], disable_cache=True)[0] except mesonlib.EnvironmentException as e: mlog.debug('OpenMP support not available in the compiler') mlog.debug(e) @@ -376,7 +376,7 @@ class OpenMPDependency(ExternalDependency): if openmp_date: self.version = self.VERSIONS[openmp_date] - if self.clib_compiler.has_header('omp.h', '', self.env, dependencies=[self]): + if self.clib_compiler.has_header('omp.h', '', self.env, dependencies=[self], disable_cache=True)[0]: self.is_found = True self.compile_args = self.link_args = self.clib_compiler.openmp_flags() else: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index b473ac8..b1fa632 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -641,7 +641,7 @@ class VulkanDependency(ExternalDependency): else: # simply try to guess it, usually works on linux libs = self.clib_compiler.find_library('vulkan', environment, []) - if libs is not None and self.clib_compiler.has_header('vulkan/vulkan.h', '', environment): + if libs is not None and self.clib_compiler.has_header('vulkan/vulkan.h', '', environment, disable_cache=True)[0]: self.type_name = 'system' self.is_found = True for lib in libs: |