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/backend/ninjabackend.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/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 6446406..7f36b7b 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2494,7 +2494,6 @@ rule FORTRAN_DEP_HACK%s # For 'automagic' deps: Boost and GTest. Also dependency('threads'). # pkg-config puts the thread flags itself via `Cflags:` need_threads = False - need_openmp = False commands += target.link_args # External deps must be last because target link libraries may depend on them. @@ -2503,15 +2502,11 @@ rule FORTRAN_DEP_HACK%s # https://github.com/mesonbuild/meson/issues/1718 commands.extend_preserving_lflags(dep.get_link_args()) need_threads |= dep.need_threads() - need_openmp |= dep.need_openmp() for d in target.get_dependencies(): if isinstance(d, build.StaticLibrary): for dep in d.get_external_deps(): need_threads |= dep.need_threads() - need_openmp |= dep.need_openmp() commands.extend_preserving_lflags(dep.get_link_args()) - if need_openmp: - commands += linker.openmp_flags() if need_threads: commands += linker.thread_link_flags(self.environment) |