Skip to content

Commit 1a1aad3

Browse files
tristan957eli-schwartz
authored andcommitted
Move JNISystemDependency to dependencies.base.detect_compiler
Only searches if the project already added that language before.
1 parent 5a7427c commit 1a1aad3

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

mesonbuild/dependencies/dev.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@
2727
from mesonbuild.interpreterbase.decorators import FeatureDeprecated
2828

2929
from .. import mesonlib, mlog
30-
from ..compilers.detect import detect_compiler_for
3130
from ..environment import get_llvm_tool_names
3231
from ..mesonlib import version_compare, stringlistify, extract_as_list
33-
from .base import DependencyException, DependencyMethods, strip_system_libdirs, SystemDependency, ExternalDependency, DependencyTypeName
32+
from .base import DependencyException, DependencyMethods, detect_compiler, strip_system_libdirs, SystemDependency, ExternalDependency, DependencyTypeName
3433
from .cmake import CMakeDependency
3534
from .configtool import ConfigToolDependency
3635
from .factory import DependencyFactory
@@ -532,7 +531,7 @@ def __init__(self, environment: 'Environment', kwargs: JNISystemDependencyKW):
532531
m = self.env.machines[self.for_machine]
533532

534533
if 'java' not in environment.coredata.compilers[self.for_machine]:
535-
detect_compiler_for(environment, 'java', self.for_machine)
534+
detect_compiler(self.name, environment, self.for_machine, 'java')
536535
self.javac = environment.coredata.compilers[self.for_machine]['java']
537536
self.version = self.javac.version
538537

0 commit comments

Comments
 (0)