aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-10-09 18:13:38 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2018-11-04 15:42:06 +0000
commitd2172a4780f06683b2417674fc85e862a7fa193b (patch)
tree80bedd38af5bbfba6193bd3e5f0931785bd64731
parent46d20219fcbeb19ba5aa0ed1e9065e33e2c23579 (diff)
downloadmeson-d2172a4780f06683b2417674fc85e862a7fa193b.zip
meson-d2172a4780f06683b2417674fc85e862a7fa193b.tar.gz
meson-d2172a4780f06683b2417674fc85e862a7fa193b.tar.bz2
Handle llvm-lib in test common/143
-rw-r--r--test cases/common/143 C and CPP link/meson.build3
1 files changed, 2 insertions, 1 deletions
diff --git a/test cases/common/143 C and CPP link/meson.build b/test cases/common/143 C and CPP link/meson.build
index d35a31b..af5c54a 100644
--- a/test cases/common/143 C and CPP link/meson.build
+++ b/test cases/common/143 C and CPP link/meson.build
@@ -26,8 +26,9 @@ libc = static_library('cfoo', ['foo.c', 'foo.h'])
cxx = meson.get_compiler('cpp')
if cxx.get_argument_syntax() == 'msvc'
+ static_linker = find_program('lib', 'llvm-lib')
compile_cmd = ['/c', '@INPUT@', '/Fo@OUTPUT@']
- stlib_cmd = ['lib', '/OUT:@OUTPUT@', '@INPUT@']
+ stlib_cmd = [static_linker, '/OUT:@OUTPUT@', '@INPUT@']
else
compile_cmd = ['-c', '-fPIC', '@INPUT@', '-o', '@OUTPUT@']
stlib_cmd = ['ar', 'csr', '@OUTPUT@', '@INPUT@']