diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-09-08 19:11:46 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-09-13 16:13:44 -0700 |
| commit | 3e0279ba9f3a5b7e9cf4f37bc7329a5b9f5f95ed (patch) | |
| tree | bb2afba84b8f17784526b3dc17d64edbe75baa7c | |
| parent | 0faaf9720f65d53dc4f9e28f786cb8dee0b7046d (diff) | |
| download | meson-3e0279ba9f3a5b7e9cf4f37bc7329a5b9f5f95ed.zip meson-3e0279ba9f3a5b7e9cf4f37bc7329a5b9f5f95ed.tar.gz meson-3e0279ba9f3a5b7e9cf4f37bc7329a5b9f5f95ed.tar.bz2 | |
get_library_dirs: Add Solaris 64-bit library subdirs
Solaris puts 32-bit libraries in the main /lib & /usr/lib directories
and 64-bit libraries in platform specific subdirectories.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | mesonbuild/mesonlib.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index d5646ed..03fbf02 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -708,6 +708,14 @@ def get_library_dirs() -> typing.List[str]: else: plat = '' + # Solaris puts 32-bit libraries in the main /lib & /usr/lib directories + # and 64-bit libraries in platform specific subdirectories. + if is_sunos(): + if machine == 'i86pc': + plat = 'amd64' + elif machine.startswith('sun4'): + plat = 'sparcv9' + usr_platdir = Path('/usr/lib/') / plat if usr_platdir.is_dir(): unixdirs += [str(x) for x in (usr_platdir).iterdir() if x.is_dir()] |