diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-07-02 10:31:39 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-07-15 10:59:22 -0700 |
| commit | d483da46a97216a15588c4413694c73e53ab9659 (patch) | |
| tree | 63819c50939763d1570fed010d373cec03d9aad1 /mesonbuild | |
| parent | cd12a6fc391782fc9101f71e7bef56590358f06c (diff) | |
| download | meson-d483da46a97216a15588c4413694c73e53ab9659.zip meson-d483da46a97216a15588c4413694c73e53ab9659.tar.gz meson-d483da46a97216a15588c4413694c73e53ab9659.tar.bz2 | |
compilers: Move clike into a mixins directory
The compilers module is rather large and confusing, with spaghetti
dependencies going every which way. I'm planning to start breaking out
the internal representations into a mixins submodule, for things that
shouldn't be required outside of the compilers module itself.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/compilers/c.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/fortran.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/__init__.py | 0 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/clike.py (renamed from mesonbuild/compilers/clike.py) | 8 | ||||
| -rw-r--r-- | mesonbuild/compilers/objc.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/objcpp.py | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index deba5a3..6fe72fb 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -18,7 +18,7 @@ import typing from .. import coredata from ..mesonlib import MachineChoice, MesonException, mlog, version_compare from .c_function_attributes import C_FUNC_ATTRIBUTES -from .clike import CLikeCompiler +from .mixins.clike import CLikeCompiler from .compilers import ( gnu_winlibs, diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index c0b6812..ed4fc54 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -37,7 +37,7 @@ from .compilers import ( VisualStudioLikeCompiler, ) from .c_function_attributes import CXX_FUNC_ATTRIBUTES, C_FUNC_ATTRIBUTES -from .clike import CLikeCompiler +from .mixins.clike import CLikeCompiler def non_msvc_eh_options(eh, args): if eh == 'none': diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index effdbad..e96cb15 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -30,7 +30,7 @@ from .compilers import ( PGICompiler, IntelVisualStudioLikeCompiler, ) -from .clike import CLikeCompiler +from .mixins.clike import CLikeCompiler from .. import mlog from mesonbuild.mesonlib import ( diff --git a/mesonbuild/compilers/mixins/__init__.py b/mesonbuild/compilers/mixins/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/mesonbuild/compilers/mixins/__init__.py diff --git a/mesonbuild/compilers/clike.py b/mesonbuild/compilers/mixins/clike.py index c2cee5f..3097603 100644 --- a/mesonbuild/compilers/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -29,10 +29,10 @@ import subprocess import typing from pathlib import Path -from .. import mesonlib -from ..mesonlib import LibType -from .. import mlog -from . import compilers +from ... import mesonlib +from ...mesonlib import LibType +from ... import mlog +from .. import compilers class CLikeCompiler: diff --git a/mesonbuild/compilers/objc.py b/mesonbuild/compilers/objc.py index 9730ea4..44c414a 100644 --- a/mesonbuild/compilers/objc.py +++ b/mesonbuild/compilers/objc.py @@ -17,7 +17,7 @@ import typing from ..mesonlib import EnvironmentException, MachineChoice -from .clike import CLikeCompiler +from .mixins.clike import CLikeCompiler from .compilers import Compiler, ClangCompiler, GnuCompiler class ObjCCompiler(CLikeCompiler, Compiler): diff --git a/mesonbuild/compilers/objcpp.py b/mesonbuild/compilers/objcpp.py index f89235e..3a232b5 100644 --- a/mesonbuild/compilers/objcpp.py +++ b/mesonbuild/compilers/objcpp.py @@ -17,7 +17,7 @@ import typing from ..mesonlib import EnvironmentException, MachineChoice -from .clike import CLikeCompiler +from .mixins.clike import CLikeCompiler from .compilers import Compiler, ClangCompiler, GnuCompiler class ObjCPPCompiler(CLikeCompiler, Compiler): |