diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2020-06-11 12:06:29 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2020-06-22 12:06:10 -0700 |
commit | 9d0ad66c29fccd2ff72c2b40da02cdb2b03ccba6 (patch) | |
tree | e19e88210892ada6d44282f9ce5a37fa33957a82 /mesonbuild/compilers/mixins | |
parent | 386721f7fd3261ba15004a7f527e9db83e216ace (diff) | |
download | meson-9d0ad66c29fccd2ff72c2b40da02cdb2b03ccba6.zip meson-9d0ad66c29fccd2ff72c2b40da02cdb2b03ccba6.tar.gz meson-9d0ad66c29fccd2ff72c2b40da02cdb2b03ccba6.tar.bz2 |
compilers: Split CompilerArgs into a separate module
I've also moved this out of the compilers pacakge because we're soon
going to need it in linkers, and that creates some serious spagetti
Diffstat (limited to 'mesonbuild/compilers/mixins')
-rw-r--r-- | mesonbuild/compilers/mixins/clike.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index b088fde..b32ac29 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -29,9 +29,10 @@ import subprocess import typing as T from pathlib import Path +from ... import arglist from ... import mesonlib -from ...mesonlib import LibType from ... import mlog +from ...mesonlib import LibType from .. import compilers from .visualstudio import VisualStudioLikeCompiler @@ -48,7 +49,7 @@ class CLikeCompiler: program_dirs_cache = {} find_library_cache = {} find_framework_cache = {} - internal_libs = compilers.unixy_compiler_internal_libs + internal_libs = arglist.UNIXY_COMPILER_INTERNAL_LIBS def __init__(self, is_cross: bool, exe_wrapper: T.Optional[str] = None): # If a child ObjC or CPP class has already set it, don't set it ourselves @@ -338,7 +339,7 @@ class CLikeCompiler: elif not isinstance(dependencies, list): dependencies = [dependencies] # Collect compiler arguments - cargs = compilers.CompilerArgs(self) + cargs = arglist.CompilerArgs(self) largs = [] for d in dependencies: # Add compile flags needed by dependencies |