Merge pull request #12808 from U2FsdGVkX1/master
Fix ninja cannot find the library when libraries contain symlinks.
diff --git a/mesonbuild/compilers/mixins/gnu.py b/mesonbuild/compilers/mixins/gnu.py
index 9c0c3f2..79f2716 100644
--- a/mesonbuild/compilers/mixins/gnu.py
+++ b/mesonbuild/compilers/mixins/gnu.py
@@ -469,16 +469,16 @@
# paths under /lib would be considered not a "system path",
# which is wrong and breaks things. Store everything, just to be sure.
pobj = pathlib.Path(p)
- unresolved = pobj.as_posix()
if pobj.exists():
- if unresolved not in result:
- result.append(unresolved)
try:
- resolved = pathlib.Path(p).resolve().as_posix()
+ resolved = pobj.resolve(True).as_posix()
if resolved not in result:
result.append(resolved)
except FileNotFoundError:
pass
+ unresolved = pobj.as_posix()
+ if unresolved not in result:
+ result.append(unresolved)
return result
def get_compiler_dirs(self, env: 'Environment', name: str) -> T.List[str]:
