aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-02-21 14:59:16 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-02-21 14:59:16 +0200
commitc6dbf98a055bb0fe1d36fc9f4f757b67ca613f01 (patch)
treee521e9e2ed4cc420d7077473ef66ca5ffc506e72
parentf5ad718f3a34f5cb96b52af5ace4d4daae51de2d (diff)
downloadmeson-c6dbf98a055bb0fe1d36fc9f4f757b67ca613f01.zip
meson-c6dbf98a055bb0fe1d36fc9f4f757b67ca613f01.tar.gz
meson-c6dbf98a055bb0fe1d36fc9f4f757b67ca613f01.tar.bz2
Do not use linker arguments of dependencies' dependencies if the target is a static library because the static linker does not understand them.
-rw-r--r--ninjabackend.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ninjabackend.py b/ninjabackend.py
index 42ebf3d..4fa4734 100644
--- a/ninjabackend.py
+++ b/ninjabackend.py
@@ -1299,10 +1299,10 @@ rule FORTRAN_DEP_HACK
if not(isinstance(target, build.StaticLibrary)):
for dep in target.get_external_deps():
commands += dep.get_link_args()
- for d in target.get_dependencies():
- if isinstance(d, build.StaticLibrary):
- for dep in d.get_external_deps():
- commands += dep.get_link_args()
+ for d in target.get_dependencies():
+ if isinstance(d, build.StaticLibrary):
+ for dep in d.get_external_deps():
+ commands += dep.get_link_args()
commands += linker.build_rpath_args(self.environment.get_build_dir(),\
target.get_rpaths(), target.install_rpath)
if self.environment.coredata.coverage: