aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorAleksey Gurtovoy <agurtovoy@acm.org>2019-10-25 14:42:36 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2019-10-29 22:40:13 +0200
commit6eee9e48bbf43e2be511fbdf1b2bcfee32f614ef (patch)
treeb10030f8a48565be002a5bcb2c32cd665ce8a1a7 /run_unittests.py
parent6e18e5b0b3dfbb359a4ef0410dce097913e00efa (diff)
downloadmeson-6eee9e48bbf43e2be511fbdf1b2bcfee32f614ef.zip
meson-6eee9e48bbf43e2be511fbdf1b2bcfee32f614ef.tar.gz
meson-6eee9e48bbf43e2be511fbdf1b2bcfee32f614ef.tar.bz2
MSVC: support -LIBPATH
Fixes #6101 (with a test), following up #5881
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 80b23b7..abb4134 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -3162,7 +3162,7 @@ recommended as it is not supported on some platforms''')
env = get_fake_env(testdirlib, self.builddir, self.prefix)
if env.detect_c_compiler(MachineChoice.HOST).get_id() in {'msvc', 'clang-cl', 'intel-cl'}:
# msvc-like compiler, also test it with msvc-specific flags
- libdir_flags += ['/LIBPATH:']
+ libdir_flags += ['/LIBPATH:', '-LIBPATH:']
else:
# static libraries are not linkable with -l with msvc because meson installs them
# as .a files which unix_args_to_native will not know as it expects libraries to use
@@ -3176,6 +3176,7 @@ recommended as it is not supported on some platforms''')
for libdir_flag in libdir_flags:
# build library
+ self.new_builddir()
self.init(testdirlib, extra_args=extra_args)
self.build()
self.install()