aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/dev.py
diff options
context:
space:
mode:
authorTristan Partin <tristan@partin.io>2022-12-14 18:49:00 -0600
committerTristan Partin <tristan@partin.io>2022-12-14 19:08:19 -0600
commitf287cac862d0f55778d75800058994068b3b8627 (patch)
tree8d978c46cda00c3409955399b3b693058bb68e11 /mesonbuild/dependencies/dev.py
parent57f91bb593b9eebf772a16a5519de58996d27c3a (diff)
downloadmeson-f287cac862d0f55778d75800058994068b3b8627.zip
meson-f287cac862d0f55778d75800058994068b3b8627.tar.gz
meson-f287cac862d0f55778d75800058994068b3b8627.tar.bz2
Deduplicate code in JNISystemDependency conditional
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
-rw-r--r--mesonbuild/dependencies/dev.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
index 0c4690b..448d682 100644
--- a/mesonbuild/dependencies/dev.py
+++ b/mesonbuild/dependencies/dev.py
@@ -574,10 +574,10 @@ class JNISystemDependency(SystemDependency):
return java_cpus.get(cpu, cpu)
java_home_lib = self.java_home / 'jre' / 'lib' / cpu_translate(m.cpu_family)
- java_home_lib_server = java_home_lib / "server"
else:
java_home_lib = self.java_home / 'lib'
- java_home_lib_server = java_home_lib / "server"
+
+ java_home_lib_server = java_home_lib / 'server'
if 'jvm' in modules:
jvm = self.clib_compiler.find_library('jvm', environment, extra_dirs=[str(java_home_lib_server)])