diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-02-26 16:50:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-26 16:50:53 -0800 |
| commit | 6a9a1557e4895525c7a39bfd41b32b51505a56d0 (patch) | |
| tree | cb90b98720dc7ffc0f036c741317c3efc4d318ad /mesonbuild | |
| parent | 219535aad426e9678fcab4887c1fdce321d2ba05 (diff) | |
| parent | d7d80945ea00f3536fd529a8f61ca3351fef4a2d (diff) | |
| download | meson-6a9a1557e4895525c7a39bfd41b32b51505a56d0.zip meson-6a9a1557e4895525c7a39bfd41b32b51505a56d0.tar.gz meson-6a9a1557e4895525c7a39bfd41b32b51505a56d0.tar.bz2 | |
Merge pull request #8429 from dcbaker/submit/rust-fix-linking-with-find-library
rust: correctly handle -l link args
Diffstat (limited to 'mesonbuild')
| -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 = '.' |