diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-02-26 14:18:57 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-02-27 16:49:32 -0500 |
| commit | b9274681375b39d4b63f8ece1ced6dcf18789a4f (patch) | |
| tree | 08eaaea7fd6c6409d8562e047a279de22416bc1b /mesonbuild/scripts | |
| parent | 92d18b925679f2c889bf248fa23d6611968203f4 (diff) | |
| download | meson-b9274681375b39d4b63f8ece1ced6dcf18789a4f.zip meson-b9274681375b39d4b63f8ece1ced6dcf18789a4f.tar.gz meson-b9274681375b39d4b63f8ece1ced6dcf18789a4f.tar.bz2 | |
Use cross stripper when cross compiling and allow overriding native strip executable. Closes #1414.
Diffstat (limited to 'mesonbuild/scripts')
| -rw-r--r-- | mesonbuild/scripts/meson_install.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py index 2ffc505..a025b0c 100644 --- a/mesonbuild/scripts/meson_install.py +++ b/mesonbuild/scripts/meson_install.py @@ -236,12 +236,12 @@ def install_targets(d): raise RuntimeError('File {!r} could not be found'.format(fname)) elif os.path.isfile(fname): do_copyfile(fname, outname) - if should_strip: + if should_strip and d.strip_bin is not None: if fname.endswith('.jar'): print('Not stripping jar target:', os.path.split(fname)[1]) continue print('Stripping target {!r}'.format(fname)) - ps, stdo, stde = Popen_safe(['strip', outname]) + ps, stdo, stde = Popen_safe(d.strip_bin + [outname]) if ps.returncode != 0: print('Could not strip file.\n') print('Stdout:\n%s\n' % stdo) |