diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2020-12-08 11:08:37 -0800 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2021-01-11 11:15:06 -0800 |
commit | 4b0b44aface1cd9ed073733dd80b040b5aaf4c99 (patch) | |
tree | 3150d4f22c7f179edc276b3f9a707c7b74dd9ab4 /mesonbuild/compilers/c.py | |
parent | f202da0689795ba4330581e69a879f089e169f6c (diff) | |
download | meson-4b0b44aface1cd9ed073733dd80b040b5aaf4c99.zip meson-4b0b44aface1cd9ed073733dd80b040b5aaf4c99.tar.gz meson-4b0b44aface1cd9ed073733dd80b040b5aaf4c99.tar.bz2 |
move handling of CFLAGS and friends to environment
This has a bunch of nice features. It obviously centralizes everything,
which is nice. It also means that env is only re-read at `meson --wipe`,
not `meson --reconfigure`. And it's going to allow more cleanups.
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, |