use latest labs jdk

Author: ahgamut

scripts/build-graal-helpers.bash

@@ -41,18 +41,16 @@ main () {
     export PATH="$BASELOC/testing/mx:$PATH"
     export JAVA_HOME="$MX_JDK_LABS"
     COSMOCC="$BASELOC/testing/cosmopolitan/cosmocc"
+    export PATH="$COSMOCC/bin:$PATH"
 
     cd substratevm
     mx clean
-    mx build \
-        --projects com.oracle.svm.native.jvm.posix,com.oracle.svm.native.libchelper,com.oracle.svm.native.libcontainer \
-        --alt-cc $COSMOCC/bin/$ARCH-unknown-cosmo-cc \
-        --alt-cxx $COSMOCC/bin/$ARCH-unknown-cosmo-c++ \
-        --alt-ar $COSMOCC/bin/$ARCH-linux-cosmo-ar
+    MULTITARGET=linux-$ARCH-cosmo mx build \
+        --projects com.oracle.svm.native.jvm.posix,com.oracle.svm.native.libchelper,com.oracle.svm.native.libcontainer
 
     RESULT_DIR="$BASELOC/build/graal-$ARCH-helpers"
     mkdir -p "$RESULT_DIR"
-    cp $(find mxbuild -name '*.a' | grep glibc | xargs ls -t | head -n 3) "$RESULT_DIR"
+    cp $(find mxbuild -name '*.a' | grep cosmo | xargs ls -t | head -n 3) "$RESULT_DIR"
 
     cd "$BASELOC"
 }

scripts/get-mx-labs-jdk.bash

@@ -30,9 +30,9 @@ main () {
     export PATH="$BASELOC/testing/mx:$PATH"
 
     if [ x"$ARCH" = x"x86_64" ]; then
-        LABS_LINK="https://github.com/graalvm/labs-openjdk/releases/download/jvmci-25.1-b15/labsjdk-ce-25.0.2+10-jvmci-25.1-b15-linux-amd64.tar.gz"
+        LABS_LINK="https://github.com/graalvm/labs-openjdk/releases/download/jvmci-25.1-b16/labsjdk-ce-25.0.2+10-jvmci-25.1-b16-linux-amd64.tar.gz"
     elif [ x"$ARCH" = x"aarch64" ]; then
-        LABS_LINK="https://github.com/graalvm/labs-openjdk/releases/download/jvmci-25.1-b15/labsjdk-ce-25.0.2+10-jvmci-25.1-b15-linux-aarch64.tar.gz"
+        LABS_LINK="https://github.com/graalvm/labs-openjdk/releases/download/jvmci-25.1-b16/labsjdk-ce-25.0.2+10-jvmci-25.1-b16-linux-aarch64.tar.gz"
     else
         echo "ARCH is not set!"
         exit 1
@@ -41,7 +41,7 @@ main () {
     cd "$BASELOC/testing"
     wget "$LABS_LINK" -qO boot-labs-jdk.tar.gz
     tar xzf boot-labs-jdk.tar.gz
-    mv labsjdk-ce-25.0.2-jvmci-25.1-b15 boot-labs-jdk
+    mv labsjdk-ce-25.0.2-jvmci-25.1-b16 boot-labs-jdk
 
     ls boot-labs-jdk -al
     # mx fetch-jdk \