diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-03-21 01:21:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-21 01:21:37 +0200 |
| commit | 3a613564d3f2db35ca03b2b8658f7050f5ed56d7 (patch) | |
| tree | 101ea46c91394e8d3d782620bc5630dd3c16803c /mesonbuild/dependencies/misc.py | |
| parent | 3bd27c2d8ae7c6157296ed82a016a90d8f49cc2d (diff) | |
| parent | 1f342a208122c86fa564688c518ecc63b67650df (diff) | |
| download | meson-3a613564d3f2db35ca03b2b8658f7050f5ed56d7.zip meson-3a613564d3f2db35ca03b2b8658f7050f5ed56d7.tar.gz meson-3a613564d3f2db35ca03b2b8658f7050f5ed56d7.tar.bz2 | |
Merge pull request #5116 from dcbaker/openmp-de-specialize
dependencies/openmp: Don't special case OpenMP
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index c95acff..52e8ee6 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -363,7 +363,8 @@ class OpenMPDependency(ExternalDependency): super().__init__('openmp', environment, language, kwargs) self.is_found = False try: - openmp_date = self.clib_compiler.get_define('_OPENMP', '', self.env, [], [self]) + openmp_date = self.clib_compiler.get_define( + '_OPENMP', '', self.env, self.clib_compiler.openmp_flags(), [self]) except mesonlib.EnvironmentException as e: mlog.debug('OpenMP support not available in the compiler') mlog.debug(e) @@ -373,12 +374,10 @@ class OpenMPDependency(ExternalDependency): self.version = self.VERSIONS[openmp_date] if self.clib_compiler.has_header('omp.h', '', self.env, dependencies=[self]): self.is_found = True + self.compile_args = self.link_args = self.clib_compiler.openmp_flags() else: mlog.log(mlog.yellow('WARNING:'), 'OpenMP found but omp.h missing.') - def need_openmp(self) -> bool: - return True - class ThreadDependency(ExternalDependency): def __init__(self, environment, kwargs): |