diff options
| -rw-r--r-- | mesonbuild/compilers/__init__.py | 15 | ||||
| -rw-r--r-- | mesonbuild/compilers/compilers.py (renamed from mesonbuild/compilers.py) | 10 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 2 |
3 files changed, 21 insertions, 6 deletions
diff --git a/mesonbuild/compilers/__init__.py b/mesonbuild/compilers/__init__.py new file mode 100644 index 0000000..570c2af --- /dev/null +++ b/mesonbuild/compilers/__init__.py @@ -0,0 +1,15 @@ +# Copyright 2017 The Meson development team + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from .compilers import * diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers/compilers.py index a1b2af7..0db8304 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -14,11 +14,11 @@ import contextlib, os.path, re, shutil, subprocess, tempfile -from .linkers import StaticLinker -from . import coredata -from . import mlog -from . import mesonlib -from .mesonlib import EnvironmentException, MesonException, version_compare, Popen_safe +from ..linkers import StaticLinker +from .. import coredata +from .. import mlog +from .. import mesonlib +from ..mesonlib import EnvironmentException, MesonException, version_compare, Popen_safe """This file contains the data files of all compilers Meson knows about. To support a new compiler, add its information below. diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index d06436b..4d3adc8 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import configparser, os, platform, re, shlex, shutil +import configparser, os, platform, re, shlex, shutil, subprocess from .compilers import * from .linkers import ArLinker, VisualStudioLinker |