aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/cpp.py
diff options
context:
space:
mode:
authorAndrei Alexeyev <akari@taisei-project.org>2019-10-15 00:59:59 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2019-10-18 00:31:57 +0300
commit50646a87239887fae3ad1173590709590e15c5c0 (patch)
tree0a6d0f8d167f03ad4867a4fb5e2d6a2ad33aa794 /mesonbuild/compilers/cpp.py
parenta1a8772034aef90e8d58230d8bcfce54ab27bf6a (diff)
downloadmeson-50646a87239887fae3ad1173590709590e15c5c0.zip
meson-50646a87239887fae3ad1173590709590e15c5c0.tar.gz
meson-50646a87239887fae3ad1173590709590e15c5c0.tar.bz2
Refactor duplicate Emscripten code into a mixin
Diffstat (limited to 'mesonbuild/compilers/cpp.py')
-rw-r--r--mesonbuild/compilers/cpp.py15
1 files changed, 2 insertions, 13 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index f10e33c..4e92590 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -37,6 +37,7 @@ from .mixins.clang import ClangCompiler
from .mixins.elbrus import ElbrusCompiler
from .mixins.pgi import PGICompiler
from .mixins.islinker import BasicLinkerIsCompilerMixin, LinkerEnvVarsMixin
+from .mixins.emscripten import EmscriptenMixin
if typing.TYPE_CHECKING:
from ..envconfig import MachineInfo
@@ -194,7 +195,7 @@ class AppleClangCPPCompiler(ClangCPPCompiler):
pass
-class EmscriptenCPPCompiler(LinkerEnvVarsMixin, BasicLinkerIsCompilerMixin, ClangCPPCompiler):
+class EmscriptenCPPCompiler(LinkerEnvVarsMixin, EmscriptenMixin, BasicLinkerIsCompilerMixin, ClangCPPCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice,
is_cross: bool, info: 'MachineInfo', exe_wrapper=None, **kwargs):
if not is_cross:
@@ -211,18 +212,6 @@ class EmscriptenCPPCompiler(LinkerEnvVarsMixin, BasicLinkerIsCompilerMixin, Clan
args.append(self._find_best_cpp_std(std.value))
return args
- def get_option_link_args(self, options):
- return []
-
- def get_soname_args(self, *args, **kwargs):
- raise MesonException('Emscripten does not support shared libraries.')
-
- def get_allow_undefined_link_args(self) -> typing.List[str]:
- return ['-s', 'ERROR_ON_UNDEFINED_SYMBOLS=0']
-
- def get_linker_output_args(self, output: str) -> typing.List[str]:
- return ['-o', output]
-
class ArmclangCPPCompiler(ArmclangCompiler, CPPCompiler):
def __init__(self, exelist, version, for_machine: MachineChoice,