From ae7329fd0fe3540b2f04c53b5703f98864064643 Mon Sep 17 00:00:00 2001 From: madomado Date: Thu, 20 Jul 2023 16:32:25 +0800 Subject: [PATCH] change alternative use Signed-off-by: madomado --- anda/tools/graalvm/graalvm.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/anda/tools/graalvm/graalvm.spec b/anda/tools/graalvm/graalvm.spec index 3d25bd86b1..a253a48810 100644 --- a/anda/tools/graalvm/graalvm.spec +++ b/anda/tools/graalvm/graalvm.spec @@ -39,10 +39,11 @@ PATH="$PATH:$PWD/mx-%mxver" %dnl JAVA_HOME=$PWD/openjdk1.8.0_302-jvmci-%jvmci-fastdebug cd graal/vm # we can only access macro buildroot in install section -JAVA_HOME=%buildroot/usr/lib/jvm$(alternatives --list | grep jre_1.8.0_openjdk | sed -E 's@.+?/@/@g') mx --env ce build & -JAVA_HOME=%buildroot/usr/lib/jvm$(alternatives --list | grep jre_11_openjdk | sed -E 's@.+?/@/@g') mx --env ce build & -JAVA_HOME=%buildroot/usr/lib/jvm$(alternatives --list | grep jre_17_openjdk | sed -E 's@.+?/@/@g') mx --env ce build & -JAVA_HOME=%buildroot/usr/lib/jvm$(alternatives --list | grep jre_20_openjdk | sed -E 's@.+?/@/@g') mx --env ce build & +%define javahome() JAVA_HOME=%buildroot/usr/lib/jvm$(alternatives --list | grep jre_%1 | sed -E 's@.+?/@/@g' | grep -) +%{javahome 1.8.0} mx --env ce build & +%{javahome 11} mx --env ce build & +%{javahome 17} mx --env ce build & +%{javahome 20} mx --env ce build & wait