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/c.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/c.py')
-rw-r--r-- | mesonbuild/compilers/c.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 311e65a..4a55b46 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -17,7 +17,6 @@ import typing as T from .. import coredata from ..mesonlib import MachineChoice, MesonException, mlog, version_compare, OptionKey -from ..linkers import LinkerEnvVarsMixin from .c_function_attributes import C_FUNC_ATTRIBUTES from .mixins.clike import CLikeCompiler from .mixins.ccrx import CcrxCompiler @@ -195,7 +194,7 @@ class AppleClangCCompiler(ClangCCompiler): _C2X_VERSION = '>=11.0.0' -class EmscriptenCCompiler(EmscriptenMixin, LinkerEnvVarsMixin, ClangCCompiler): +class EmscriptenCCompiler(EmscriptenMixin, ClangCCompiler): 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, |