diff options
| -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 | ||||
| -rw-r--r-- | setup.py | 1 |
8 files changed, 10 insertions, 9 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index deba5a3f2..6fe72fb9b 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 c0b6812b6..ed4fc54c8 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 effdbadf9..e96cb15ef 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 000000000..e69de29bb --- /dev/null +++ b/mesonbuild/compilers/mixins/__init__.py diff --git a/mesonbuild/compilers/clike.py b/mesonbuild/compilers/mixins/clike.py index c2cee5f1f..30976031a 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 9730ea434..44c414a0a 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 f89235eb3..3a232b521 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): @@ -31,6 +31,7 @@ packages = ['mesonbuild', 'mesonbuild.backend', 'mesonbuild.cmake', 'mesonbuild.compilers', + 'mesonbuild.compilers.mixins', 'mesonbuild.dependencies', 'mesonbuild.modules', 'mesonbuild.scripts', |