diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-01-12 16:19:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 16:19:58 +0000 |
| commit | 5ff1a3ab25504563f87ac064ce21826cb0b936aa (patch) | |
| tree | 0043efe041af7080ef79f19fec21b21929d0cd43 /mesonbuild/compilers/cpp.py | |
| parent | c659be692896f9f36fa46c4955220dc57653f09b (diff) | |
| parent | ff40ca25b776392625275bd7891701e02675e2b7 (diff) | |
| download | meson-5ff1a3ab25504563f87ac064ce21826cb0b936aa.zip meson-5ff1a3ab25504563f87ac064ce21826cb0b936aa.tar.gz meson-5ff1a3ab25504563f87ac064ce21826cb0b936aa.tar.bz2 | |
Merge pull request #8159 from dcbaker/submit/all-env-variables-up-front
Read and store all environment variables up front
Diffstat (limited to 'mesonbuild/compilers/cpp.py')
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 2e94e48..ebe3a4f 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -21,7 +21,6 @@ from .. import coredata from .. import mlog from ..mesonlib import MesonException, MachineChoice, version_compare, OptionKey -from ..linkers import LinkerEnvVarsMixin from .compilers import ( gnu_winlibs, msvc_winlibs, @@ -256,7 +255,7 @@ class AppleClangCPPCompiler(ClangCPPCompiler): return ['-lc++'] -class EmscriptenCPPCompiler(EmscriptenMixin, LinkerEnvVarsMixin, ClangCPPCompiler): +class EmscriptenCPPCompiler(EmscriptenMixin, ClangCPPCompiler): def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice, is_cross: bool, info: 'MachineInfo', exe_wrapper: T.Optional['ExternalProgram'] = None, linker: T.Optional['DynamicLinker'] = None, |