aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2024-07-11 13:39:58 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2024-07-11 13:39:58 +0300
commit94e30d56b8a7d17635d51621df5ab4e85db97f0c (patch)
tree8808de7404e0346f221f3144354188af0a838671
parent0d7bb776e2d97d406b726b90090bbfa8df13232b (diff)
downloadmeson-uniquefilenames.zip
meson-uniquefilenames.tar.gz
meson-uniquefilenames.tar.bz2
Make source file names more unique.uniquefilenames
-rw-r--r--mesonbuild/compilers/detect.py2
-rw-r--r--mesonbuild/compilers/javac.py (renamed from mesonbuild/compilers/java.py)0
2 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py
index 3a67821..b61de68 100644
--- a/mesonbuild/compilers/detect.py
+++ b/mesonbuild/compilers/detect.py
@@ -879,7 +879,7 @@ def _detect_objc_or_objcpp_compiler(env: 'Environment', lang: str, for_machine:
raise EnvironmentException('Unreachable code (exception to make mypy happy)')
def detect_java_compiler(env: 'Environment', for_machine: MachineChoice) -> Compiler:
- from .java import JavaCompiler
+ from .javac import JavaCompiler
exelist = env.lookup_binary_entry(for_machine, 'java')
info = env.machines[for_machine]
if exelist is None:
diff --git a/mesonbuild/compilers/java.py b/mesonbuild/compilers/javac.py
index 540e2aa..540e2aa 100644
--- a/mesonbuild/compilers/java.py
+++ b/mesonbuild/compilers/javac.py