diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-06-10 01:49:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 01:49:16 +0300 |
| commit | 06df6e463f3d7f62676f8f9ce0cf81fbb4058eaf (patch) | |
| tree | d6e80b4aa73a30e31861d35aa00127fd625fcca8 /mesonbuild/compilers/java.py | |
| parent | 6b4b601eafc5320e62060f39da5acad7c3007942 (diff) | |
| parent | 6d6af46edcb765d7046533fdad4d03b0c0c9cd64 (diff) | |
| download | meson-06df6e463f3d7f62676f8f9ce0cf81fbb4058eaf.zip meson-06df6e463f3d7f62676f8f9ce0cf81fbb4058eaf.tar.gz meson-06df6e463f3d7f62676f8f9ce0cf81fbb4058eaf.tar.bz2 | |
Merge pull request #4010 from Ericson2314/purge-cross-conditional-preview
Purge much `is_cross` and `<things>_cross` without changing user interfaces---includes on #5263
Diffstat (limited to 'mesonbuild/compilers/java.py')
| -rw-r--r-- | mesonbuild/compilers/java.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/java.py index 5d7f865..ea1fa0f 100644 --- a/mesonbuild/compilers/java.py +++ b/mesonbuild/compilers/java.py @@ -14,14 +14,14 @@ import os.path, shutil, subprocess -from ..mesonlib import EnvironmentException +from ..mesonlib import EnvironmentException, MachineChoice from .compilers import Compiler, java_buildtype_args class JavaCompiler(Compiler): - def __init__(self, exelist, version): + def __init__(self, exelist, version, for_machine: MachineChoice): self.language = 'java' - super().__init__(exelist, version) + super().__init__(exelist, version, for_machine) self.id = 'unknown' self.is_cross = False self.javarunner = 'java' |