diff options
| -rw-r--r-- | mesonbuild/compilers/__init__.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 2 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/arm.py | 1 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/ccrx.py | 2 | ||||
| -rw-r--r-- | mesonbuild/envconfig.py | 2 | ||||
| -rw-r--r-- | mesonbuild/scripts/scanbuild.py | 1 | ||||
| -rwxr-xr-x | run_tests.py | 1 | ||||
| -rwxr-xr-x | run_unittests.py | 1 |
8 files changed, 4 insertions, 8 deletions
diff --git a/mesonbuild/compilers/__init__.py b/mesonbuild/compilers/__init__.py index aebfb32..b378a63 100644 --- a/mesonbuild/compilers/__init__.py +++ b/mesonbuild/compilers/__init__.py @@ -55,9 +55,11 @@ __all__ = [ 'G95FortranCompiler', 'GnuCCompiler', 'ElbrusCCompiler', + 'EmscriptenCCompiler', 'GnuCompiler', 'GnuCPPCompiler', 'ElbrusCPPCompiler', + 'EmscriptenCPPCompiler', 'GnuDCompiler', 'GnuFortranCompiler', 'ElbrusFortranCompiler', diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 8456a99..51ff55d 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -21,7 +21,7 @@ from .. import coredata from .. import mlog from .. import mesonlib from ..mesonlib import ( - EnvironmentException, MachineChoice, MesonException, OrderedSet, + EnvironmentException, MachineChoice, MesonException, Popen_safe, split_args ) from ..envconfig import ( diff --git a/mesonbuild/compilers/mixins/arm.py b/mesonbuild/compilers/mixins/arm.py index 62e6f48..3a7e597 100644 --- a/mesonbuild/compilers/mixins/arm.py +++ b/mesonbuild/compilers/mixins/arm.py @@ -76,7 +76,6 @@ class ArmCompiler: # Assembly self.can_compile_suffixes.add('s') - def get_pic_args(self) -> typing.List[str]: # FIXME: Add /ropi, /rwpi, /fpic etc. qualifiers to --apcs return [] diff --git a/mesonbuild/compilers/mixins/ccrx.py b/mesonbuild/compilers/mixins/ccrx.py index 7fbc316..c6979a4 100644 --- a/mesonbuild/compilers/mixins/ccrx.py +++ b/mesonbuild/compilers/mixins/ccrx.py @@ -17,7 +17,7 @@ import os import typing -from ...mesonlib import Popen_safe, EnvironmentException +from ...mesonlib import EnvironmentException if typing.TYPE_CHECKING: from ...environment import Environment diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py index de8ee16..716ee91 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -260,11 +260,9 @@ class MachineInfo: """Machine is illumos or Solaris?""" return self.system == 'sunos' - # Various prefixes and suffixes for import libraries, shared libraries, # static libraries, and executables. # Versioning is added to these names in the backends as-needed. - def get_exe_suffix(self) -> str: if self.is_windows() or self.is_cygwin(): return 'exe' diff --git a/mesonbuild/scripts/scanbuild.py b/mesonbuild/scripts/scanbuild.py index d83ca12..b9e96d2 100644 --- a/mesonbuild/scripts/scanbuild.py +++ b/mesonbuild/scripts/scanbuild.py @@ -17,7 +17,6 @@ import subprocess import shutil import tempfile from ..environment import detect_ninja, detect_scanbuild -from ..mesonlib import Popen_safe, split_args def scanbuild(exelist, srcdir, blddir, privdir, logdir, args): diff --git a/run_tests.py b/run_tests.py index 85a55c3..504e6ac 100755 --- a/run_tests.py +++ b/run_tests.py @@ -116,7 +116,6 @@ def get_fake_env(sdir='', bdir=None, prefix='', opts=None): Backend = Enum('Backend', 'ninja vs xcode') if 'MESON_EXE' in os.environ: - import shlex meson_exe = mesonlib.split_args(os.environ['MESON_EXE']) else: meson_exe = None diff --git a/run_unittests.py b/run_unittests.py index cb5f125..f587429 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -3183,7 +3183,6 @@ recommended as it is not supported on some platforms''') self.installdir = initial_builddir self.builddir = initial_installdir - def test_conflicting_d_dash_option(self): testdir = os.path.join(self.unit_test_dir, '37 mixed command line args') with self.assertRaises(subprocess.CalledProcessError) as e: |