From e7e04c814ba8f513deb7b67d298277e083cd1514 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 23 Feb 2021 11:05:47 -0800 Subject: Add a rust test for internal c linkage We have code to support this, but no tests. That seems pretty bad. And better yet, it doesn't work on MSVC in some cases. --- mesonbuild/backend/ninjabackend.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index cd7f450..3749ff7 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1608,12 +1608,19 @@ int dummy; # dependency, so that collisions with libraries in rustc's # sysroot don't cause ambiguity args += ['--extern', '{}={}'.format(d.name, os.path.join(d.subdir, d.filename))] + elif d.typename == 'static library': + # Rustc doesn't follow Meson's convention that static libraries + # are called .a, and implementation libraries are .lib, so we + # have to manually handle that. + if rustc.linker.id == 'link': + args += ['-C', f'link-arg={self.get_target_filename_for_linking(d)}'] + else: + args += ['-l', f'static={d.name}'] + external_deps.extend(d.external_deps) else: - # Rust uses -l for non rust dependencies, but we still need to add (shared|static)=foo - _type = 'static' if d.typename == 'static library' else 'dylib' - args += ['-l', f'{_type}={d.name}'] - if d.typename == 'static library': - external_deps.extend(d.external_deps) + # Rust uses -l for non rust dependencies, but we still need to + # add dylib=foo + args += ['-l', f'dylib={d.name}'] for e in external_deps: for a in e.get_link_args(): if a.endswith(('.dll', '.so', '.dylib')): -- cgit v1.1