diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-03-18 15:52:04 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-03-19 12:48:22 -0700 |
| commit | 1f342a208122c86fa564688c518ecc63b67650df (patch) | |
| tree | 911d7f4bd82c633fdbd213a13afd3855da5ca31d /mesonbuild/dependencies/misc.py | |
| parent | 2a6b8e209fc6cbcd9499a0697c08bcb0169a2e54 (diff) | |
| download | meson-1f342a208122c86fa564688c518ecc63b67650df.zip meson-1f342a208122c86fa564688c518ecc63b67650df.tar.gz meson-1f342a208122c86fa564688c518ecc63b67650df.tar.bz2 | |
dependencies/openmp: Don't special case OpenMP
Currently we specialcase OpenMP like we do threads, with a special
`need_openmp` method. This seems like a great idea, but doesn't work
out in practice, as well as it complicates the opemp
implementation. If GCC is built without opemp support for example, we
still add -fopenmp to the the command line, which results in
compilation errors.
This patch discards that and treats it like a normal dependency,
removes the need_openmp() method, and sets the compile_args attributes
from the compiler.
Fixes #5115
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 51dc9f3..52e8ee6 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -374,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): |