diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-03-27 14:53:36 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-27 23:11:26 +0300 |
| commit | 2376d6eadfef6719d434cd130386aeb66070aff4 (patch) | |
| tree | fbae0702738b91e64fb3b6f3457d3312800887a9 | |
| parent | 98e71e1e65ed2992c06dfa41169a73f0b44df2cf (diff) | |
| download | meson-2376d6eadfef6719d434cd130386aeb66070aff4.zip meson-2376d6eadfef6719d434cd130386aeb66070aff4.tar.gz meson-2376d6eadfef6719d434cd130386aeb66070aff4.tar.bz2 | |
Don't delete static library on Windows
The actual fix is quite involved (#1526), so just disable this for now
since it's much worse to not be able to generate static libraries at
all vs a minor bug in static libraries getting stale objects (#1356)
Closes https://github.com/mesonbuild/meson/issues/1517
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index a167c46..cc350b2 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1248,7 +1248,11 @@ int dummy; else: command_template = ' command = {executable} $LINK_ARGS {output_args} $in\n' cmdlist = [] - if isinstance(static_linker, compilers.ArLinker): + # FIXME: Must normalize file names with pathlib.Path before writing + # them out to fix this properly on Windows. See: + # https://github.com/mesonbuild/meson/issues/1517 + # https://github.com/mesonbuild/meson/issues/1526 + if isinstance(static_linker, compilers.ArLinker) and not mesonlib.is_windows(): # `ar` has no options to overwrite archives. It always appends, # which is never what we want. Delete an existing library first if # it exists. https://github.com/mesonbuild/meson/issues/1355 |