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/backend/ninjabackend.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/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 21c6c08..9e4ba0f 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) |