From 9de91586994af5078decda17db92ce50c5673951 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 14 Sep 2025 12:20:31 +0200 Subject: [PATCH] build: Get bootclasspath from pkg-config Now that we require art-standalone to be found using pkg-config, we can use it to get its libdir path. --- meson.build | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/meson.build b/meson.build index ad776069..7291dfc2 100644 --- a/meson.build +++ b/meson.build @@ -16,15 +16,7 @@ libdl_bio_dep = [ libc_bio_dep = [ cc.find_library('c_bio') ] -if fs.is_file('/usr' / get_option('libdir') / 'java/core-all_classes.jar') - bootclasspath_dir = '/usr' / get_option('libdir') / 'java' -elif fs.is_file('/usr/local' / get_option('libdir') / 'java/core-all_classes.jar') - bootclasspath_dir = '/usr/local' / get_option('libdir') / 'java' -elif fs.is_file(get_option('prefix') / get_option('libdir') / 'java/core-all_classes.jar') - bootclasspath_dir = get_option('prefix') / get_option('libdir') / 'java' -else - error('bootclasspath "core-all_classes.jar" not found') -endif +bootclasspath_dir = libart_dep.get_variable(pkgconfig: 'libdir') / 'java' bootclasspath = bootclasspath_dir / 'core-all_classes.jar' + ':' + bootclasspath_dir / 'core-junit_classes.jar' + ':' + bootclasspath_dir / 'junit-runner_classes.jar'