diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-04 05:52:33 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-04 05:52:33 -0500 |
commit | 2ecb26c9ae093a16c1f79b3b81ca0c66c054f579 (patch) | |
tree | 00349a92ecab80359e33a9f391cfa126691a2558 /mesonbuild/backend | |
parent | b3aaab3a038f9139f5735d590b5036c25fd033a0 (diff) | |
parent | 303b8819ecc4adf5268d0a73aa25aa1540b3c2bc (diff) | |
download | meson-2ecb26c9ae093a16c1f79b3b81ca0c66c054f579.zip meson-2ecb26c9ae093a16c1f79b3b81ca0c66c054f579.tar.gz meson-2ecb26c9ae093a16c1f79b3b81ca0c66c054f579.tar.bz2 |
Merge pull request #1444 from mesonbuild/pdbinstall
Install PDB files. Closes #1442.
Diffstat (limited to 'mesonbuild/backend')
-rw-r--r-- | mesonbuild/backend/backends.py | 6 | ||||
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 26052d3..5939488 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -115,12 +115,6 @@ class Backend: return os.path.join(self.get_target_dir(target), target.get_filename()) raise AssertionError('BUG: Tried to link to something that\'s not a library') - def get_target_debug_filename(self, target): - fname = target.get_debug_filename() - if not fname: - raise AssertionError("BUG: Tried to generate debug filename when it doesn't exist") - return os.path.join(self.get_target_dir(target), fname) - def get_target_dir(self, target): if self.environment.coredata.get_builtin_option('layout') == 'mirror': dirname = target.get_subdir() diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index d696076..4d54acb 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -654,13 +654,6 @@ int dummy; else: # XXX: Add BuildTarget-specific install dir cases here outdir = self.environment.get_libdir() - if isinstance(t, build.SharedLibrary) or isinstance(t, build.Executable): - if t.get_debug_filename(): - # Install the debug symbols file in the same place as - # the target itself. It has no aliases, should not be - # stripped, and doesn't have an install_rpath - i = [self.get_target_debug_filename(t), outdir, {}, False, ''] - d.targets.append(i) if isinstance(t, build.BuildTarget): i = [self.get_target_filename(t), outdir, t.get_aliases(), should_strip, t.install_rpath] |