diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-12-06 00:44:47 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-12-06 16:20:54 +0200 |
commit | c44a5a1aeca638f46b4a2d8d4a9fcb0a554037df (patch) | |
tree | 71c4fd88e2fdd98dfd61d8c3f539999ea22a658b /mesonbuild/backend/ninjabackend.py | |
parent | 4db1b3a09f8e1f9faf7747beca2bc77ae0e5a6a5 (diff) | |
download | meson-c44a5a1aeca638f46b4a2d8d4a9fcb0a554037df.zip meson-c44a5a1aeca638f46b4a2d8d4a9fcb0a554037df.tar.gz meson-c44a5a1aeca638f46b4a2d8d4a9fcb0a554037df.tar.bz2 |
Deduplicate export-dynamic and pthread. Closes #4567.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 5606c41..f49649b 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2442,7 +2442,7 @@ rule FORTRAN_DEP_HACK%s for dep in target.get_external_deps(): # Extend without reordering or de-dup to preserve `-L -l` sets # https://github.com/mesonbuild/meson/issues/1718 - commands.extend_direct(dep.get_link_args()) + commands.extend_preserving_lflags(dep.get_link_args()) need_threads |= dep.need_threads() need_openmp |= dep.need_openmp() for d in target.get_dependencies(): @@ -2450,7 +2450,7 @@ rule FORTRAN_DEP_HACK%s for dep in d.get_external_deps(): need_threads |= dep.need_threads() need_openmp |= dep.need_openmp() - commands.extend_direct(dep.get_link_args()) + commands.extend_preserving_lflags(dep.get_link_args()) if need_openmp: commands += linker.openmp_flags() if need_threads: |