aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authornyorain <nyorain@gmail.com>2017-07-24 17:04:33 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2017-08-04 19:50:39 +0300
commit0a9170bbbe6b90ebc0cb4aad8c56090dfce4aa2d (patch)
treea60a4e9665c34d4915274a22f267731fc4e4a1a2 /mesonbuild
parentcad6bf32f121fc6584800e3a85fa341b8b7c1b04 (diff)
downloadmeson-0a9170bbbe6b90ebc0cb4aad8c56090dfce4aa2d.zip
meson-0a9170bbbe6b90ebc0cb4aad8c56090dfce4aa2d.tar.gz
meson-0a9170bbbe6b90ebc0cb4aad8c56090dfce4aa2d.tar.bz2
Fix #1993
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/ninjabackend.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 287b683..9048a78 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -2264,7 +2264,7 @@ rule FORTRAN_DEP_HACK
commands += linker.get_gui_app_args()
# If implib, and that's significant on this platform (i.e. Windows using either GCC or Visual Studio)
if target.import_filename:
- commands += linker.gen_import_library_args(os.path.join(target.subdir, target.import_filename))
+ commands += linker.gen_import_library_args(os.path.join(self.get_target_dir(target), target.import_filename))
elif isinstance(target, build.SharedLibrary):
if isinstance(target, build.SharedModule):
commands += linker.get_std_shared_module_link_args()
@@ -2281,7 +2281,7 @@ rule FORTRAN_DEP_HACK
commands += linker.gen_vs_module_defs_args(target.vs_module_defs.rel_to_builddir(self.build_to_src))
# This is only visited when building for Windows using either GCC or Visual Studio
if target.import_filename:
- commands += linker.gen_import_library_args(os.path.join(target.subdir, target.import_filename))
+ commands += linker.gen_import_library_args(os.path.join(self.get_target_dir(target), target.import_filename))
elif isinstance(target, build.StaticLibrary):
commands += linker.get_std_link_args()
else: