From c75b75d487d8a57fbcab9c48305c0003a91fb811 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Thu, 19 Nov 2015 17:49:08 +0200 Subject: Do not use linker arguments on static libraries. --- ninjabackend.py | 3 ++- test cases/common/3 static/meson.build | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ninjabackend.py b/ninjabackend.py index d2791a5..7696f15 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -1450,7 +1450,8 @@ rule FORTRAN_DEP_HACK for d in target.external_deps: if d.need_threads(): commands += linker.thread_link_flags() - commands += target.link_args + if not isinstance(target, build.StaticLibrary): + commands += target.link_args # External deps must be last because target link libraries may depend on them. if not(isinstance(target, build.StaticLibrary)): for dep in target.get_external_deps(): diff --git a/test cases/common/3 static/meson.build b/test cases/common/3 static/meson.build index fd33e1c..3dee93b 100644 --- a/test cases/common/3 static/meson.build +++ b/test cases/common/3 static/meson.build @@ -1,2 +1,3 @@ project('static library test', 'c') -lib = static_library('mylib', 'libfile.c') +lib = static_library('mylib', 'libfile.c', + link_args : '-THISMUSTNOBEUSED') # Static linker needs to ignore all link args. -- cgit v1.1