diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-02-26 11:52:48 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2021-02-26 14:26:15 -0800 |
| commit | d7d80945ea00f3536fd529a8f61ca3351fef4a2d (patch) | |
| tree | 328d1c9d50e20f0f7bb79adc9216ac220deae108 | |
| parent | e127e47d7a5aadc18240c920c8b24f32acff67a2 (diff) | |
| download | meson-d7d80945ea00f3536fd529a8f61ca3351fef4a2d.zip meson-d7d80945ea00f3536fd529a8f61ca3351fef4a2d.tar.gz meson-d7d80945ea00f3536fd529a8f61ca3351fef4a2d.tar.bz2 | |
rust: a meson -l argument could be etiher a static or dynamic library
I made an incorrect assumption that -l arguments would always be static
libraries, but they might well be shared libraries.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index b7723ef..240cc0a 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1624,8 +1624,8 @@ int dummy; elif a.startswith('-L'): args.append(a) elif a.startswith('-l'): - # This should always be a static lib, I think - args.extend(['-l', f'static={a[2:]}']) + _type = 'static' if e.static else 'dylib' + args.extend(['-l', f'{_type}={a[2:]}']) for d in linkdirs: if d == '': d = '.' |