diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-04-08 21:06:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 21:06:55 +0300 |
| commit | 54db2c9babe6391bba525f92573ceeadb8303e78 (patch) | |
| tree | d6505c115e68fae42eddb8b7e3337cf4606e9dda /mesonbuild/backend | |
| parent | d72d98d3afdd0fadaf891c90a14f68c318f666fb (diff) | |
| parent | 63090605a5c7f905491dccb663be8bca7d935489 (diff) | |
| download | meson-54db2c9babe6391bba525f92573ceeadb8303e78.zip meson-54db2c9babe6391bba525f92573ceeadb8303e78.tar.gz meson-54db2c9babe6391bba525f92573ceeadb8303e78.tar.bz2 | |
Merge pull request #5225 from dcbaker/threads-is-not-special
Threads is not special
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/backends.py | 2 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 04255dc..119c1c2 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -643,8 +643,6 @@ class Backend: commands += dep.get_exe_args(compiler) # For 'automagic' deps: Boost and GTest. Also dependency('threads'). # pkg-config puts the thread flags itself via `Cflags:` - if dep.need_threads(): - commands += compiler.thread_flags(self.environment) # Fortran requires extra include directives. if compiler.language == 'fortran': for lt in target.link_targets: 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) |