diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2019-04-05 16:41:08 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2019-04-05 16:41:08 -0700 |
commit | 6ad7fbf9509dd68792df7df08b785967a067d4c4 (patch) | |
tree | d4ed3b440daefa52c8fe9301c92505a53e96f49f /mesonbuild/backend/ninjabackend.py | |
parent | b842b0b04aa8678f98cbec5f7022e75636ddf4a3 (diff) | |
download | meson-6ad7fbf9509dd68792df7df08b785967a067d4c4.zip meson-6ad7fbf9509dd68792df7df08b785967a067d4c4.tar.gz meson-6ad7fbf9509dd68792df7df08b785967a067d4c4.tar.bz2 |
dependencies/misc: don't special case threads
Instad of having special casing of threads in the backends and
everywehre else, do what we did for openmp, create a real
dependency. Then make use of the fact that dependencies can now have
sub dependencies to add threads.
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 64ea5a6..a3b9ce8 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2511,7 +2511,6 @@ rule FORTRAN_DEP_HACK%s if not isinstance(target, build.StaticLibrary): # For 'automagic' deps: Boost and GTest. Also dependency('threads'). # pkg-config puts the thread flags itself via `Cflags:` - need_threads = False commands += target.link_args # External deps must be last because target link libraries may depend on them. @@ -2519,14 +2518,10 @@ rule FORTRAN_DEP_HACK%s # Extend without reordering or de-dup to preserve `-L -l` sets # https://github.com/mesonbuild/meson/issues/1718 commands.extend_preserving_lflags(dep.get_link_args()) - need_threads |= dep.need_threads() for d in target.get_dependencies(): if isinstance(d, build.StaticLibrary): for dep in d.get_external_deps(): - need_threads |= dep.need_threads() commands.extend_preserving_lflags(dep.get_link_args()) - if need_threads: - commands += linker.thread_link_flags(self.environment) # Add link args specific to this BuildTarget type that must not be overridden by dependencies commands += self.get_target_type_link_args_post_dependencies(target, linker) |