diff options
Diffstat (limited to 'mesonbuild/backend')
-rw-r--r-- | mesonbuild/backend/backends.py | 2 | ||||
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 3 | ||||
-rw-r--r-- | mesonbuild/backend/vs2010backend.py | 2 | ||||
-rw-r--r-- | mesonbuild/backend/xcodebackend.py | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 313580b..57a39d1 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -18,7 +18,7 @@ from .. import dependencies from .. import mesonlib import json import subprocess -from ..coredata import MesonException +from ..mesonlib import MesonException class InstallData(): def __init__(self, source_dir, build_dir, prefix): diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index dfd792b..8984008 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -18,10 +18,9 @@ from .. import build from .. import mlog from .. import dependencies from .. import compilers -from ..mesonlib import File +from ..mesonlib import File, MesonException from .backends import InstallData from ..build import InvalidArguments -from ..coredata import MesonException import os, sys, pickle, re import subprocess, shutil diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index ae4cd33..2f05c97 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -24,7 +24,7 @@ from .. import dependencies from .. import mlog import xml.etree.ElementTree as ET import xml.dom.minidom -from ..coredata import MesonException +from ..mesonlib import MesonException from ..environment import Environment class RegenInfo(): diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index eb8b0b9..6bda826 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -17,7 +17,7 @@ from .. import build from .. import mesonlib import uuid, os, sys -from ..coredata import MesonException +from ..mesonlib import MesonException class XCodeBackend(backends.Backend): def __init__(self, build): |