diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-03-08 14:04:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-08 14:04:48 +0200 |
| commit | 7234316dc7784667443d358b0d2c3e2ff561b474 (patch) | |
| tree | fbf0413aaa221acd2a8437b75cf5dd349471563c /mesonbuild/compilers/cpp.py | |
| parent | a16db4e9185fcf060ea3e336cbffbe16018be934 (diff) | |
| parent | 654f427759d5aa3be55d8929b18c17a2b8fcac69 (diff) | |
| download | meson-7234316dc7784667443d358b0d2c3e2ff561b474.zip meson-7234316dc7784667443d358b0d2c3e2ff561b474.tar.gz meson-7234316dc7784667443d358b0d2c3e2ff561b474.tar.bz2 | |
Merge pull request #6688 from dcbaker/emcc-linker-bugs
Emcc linker bugs and improvments
Diffstat (limited to 'mesonbuild/compilers/cpp.py')
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 26b34e3..2470bd5 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -36,7 +36,7 @@ from .mixins.intel import IntelGnuLikeCompiler, IntelVisualStudioLikeCompiler from .mixins.clang import ClangCompiler from .mixins.elbrus import ElbrusCompiler from .mixins.pgi import PGICompiler -from .mixins.islinker import BasicLinkerIsCompilerMixin, LinkerEnvVarsMixin +from .mixins.islinker import LinkerEnvVarsMixin from .mixins.emscripten import EmscriptenMixin if T.TYPE_CHECKING: @@ -207,7 +207,7 @@ class AppleClangCPPCompiler(ClangCPPCompiler): pass -class EmscriptenCPPCompiler(LinkerEnvVarsMixin, EmscriptenMixin, BasicLinkerIsCompilerMixin, ClangCPPCompiler): +class EmscriptenCPPCompiler(EmscriptenMixin, LinkerEnvVarsMixin, ClangCPPCompiler): def __init__(self, exelist, version, for_machine: MachineChoice, is_cross: bool, info: 'MachineInfo', exe_wrapper=None, **kwargs): if not is_cross: |