From 4030ee4b6f4c6c65a6b0a772438b7d68835fc529 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Mon, 19 Aug 2019 15:46:24 -0700 Subject: [PATCH] the solaris linker also needs start/end-group for circular linking --- mesonbuild/compilers/compilers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 38bf2408a..a1292a4b1 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -16,7 +16,7 @@ import contextlib, enum, os.path, re, tempfile import typing from typing import Optional, Tuple, List -from ..linkers import StaticLinker, GnuLikeDynamicLinkerMixin +from ..linkers import StaticLinker, GnuLikeDynamicLinkerMixin, SolarisDynamicLinker from .. import coredata from .. import mlog from .. import mesonlib @@ -533,7 +533,7 @@ class CompilerArgs(list): # TODO: this could probably be added to the DynamicLinker instead if (hasattr(self.compiler, 'linker') and self.compiler.linker is not None and - isinstance(self.compiler.linker, GnuLikeDynamicLinkerMixin)): + isinstance(self.compiler.linker, (GnuLikeDynamicLinkerMixin, SolarisDynamicLinker))): group_start = -1 group_end = -1 for i, each in enumerate(new):