diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 | ||||
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 16 |
2 files changed, 17 insertions, 3 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: diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 3761433..bdc90da 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -612,7 +612,10 @@ class CompilerArgs(list): dedup2_suffixes = () dedup2_args = () # Arg prefixes and args that must be de-duped by returning 1 - dedup1_prefixes = ('-l', '-Wl,-l') + # + # NOTE: not thorough. A list of potential corner cases can be found in + # https://github.com/mesonbuild/meson/pull/4593#pullrequestreview-182016038 + dedup1_prefixes = ('-l', '-Wl,-l', '-Wl,--export-dynamic') dedup1_suffixes = ('.lib', '.dll', '.so', '.dylib', '.a') # Match a .so of the form path/to/libfoo.so.0.1.0 # Only UNIX shared libraries require this. Others have a fixed extension. @@ -748,6 +751,17 @@ class CompilerArgs(list): for elem in iterable: self.append_direct(elem) + def extend_preserving_lflags(self, iterable): + normal_flags = [] + lflags = [] + for i in iterable: + if i.startswith('-l') or i.startswith('-L'): + lflags.append(i) + else: + normal_flags.append(i) + self.extend(normal_flags) + self.extend_direct(lflags) + def __add__(self, args): new = CompilerArgs(self, self.compiler) new += args |