diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-02 23:57:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-02 23:57:19 +0200 |
| commit | 3276bdd23d0479eb343b95e80ac0d87475bb3a7e (patch) | |
| tree | aec07111dda4960f3db83ba4eef06531ac941277 /mesonbuild/build.py | |
| parent | e933bdd87229f13766705274a8815e9f10d4fe8d (diff) | |
| parent | 07d7e87411ca411682344c945c006fd61fa7ab98 (diff) | |
| download | meson-3276bdd23d0479eb343b95e80ac0d87475bb3a7e.zip meson-3276bdd23d0479eb343b95e80ac0d87475bb3a7e.tar.gz meson-3276bdd23d0479eb343b95e80ac0d87475bb3a7e.tar.bz2 | |
Merge pull request #1102 from mesonbuild/soname
Fix soname symlink generation
Diffstat (limited to 'mesonbuild/build.py')
| -rw-r--r-- | mesonbuild/build.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 39e215f..462a55b 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1069,12 +1069,10 @@ class SharedLibrary(BuildTarget): self.soversion = str(self.soversion) if not isinstance(self.soversion, str): raise InvalidArguments('Shared library soversion is not a string or integer.') - try: - int(self.soversion) - except ValueError: - raise InvalidArguments('Shared library soversion must be a valid integer') elif self.ltversion: # library version is defined, get the soversion from that + # We replicate what Autotools does here and take the first + # number of the version by default. self.soversion = self.ltversion.split('.')[0] # Visual Studio module-definitions file if 'vs_module_defs' in kwargs: |