aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/misc.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-05-02 14:54:02 -0700
committerGitHub <noreply@github.com>2019-05-02 14:54:02 -0700
commitc0aa89e57ff5a92c1a1e2cf542692f54622d8cd2 (patch)
treefebe385c372b2a1009be83be16528a892df60de5 /mesonbuild/dependencies/misc.py
parentae9a6417fe8158573801e10b84906931facb8112 (diff)
parentc61ae46461bf9f4c7afef2381032ac0cb2d26043 (diff)
downloadmeson-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/misc.py')
-rw-r--r--mesonbuild/dependencies/misc.py4
1 files changed, 2 insertions, 2 deletions
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: