diff --git a/.github/workflows/toolchains/toolchain_arm64.cmake b/.github/workflows/toolchains/toolchain_arm64.cmake index 2f5feaf..13d1b48 100644 --- a/.github/workflows/toolchains/toolchain_arm64.cmake +++ b/.github/workflows/toolchains/toolchain_arm64.cmake @@ -54,14 +54,19 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) #include_directories("${CROSS_OPENJDK_PATH}/include/linux") SET(JAVA_HOME "/usr/lib/jvm/default-java/") -SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-arm64") +if(EXISTS "/usr/lib/jvm/java-17-openjdk-arm64") + SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-arm64") + SET(JAVA_JVM_LIBRARY "${JAVA_CROSS_HOME}/lib/server/libjvm.so") + SET(JAVA_AWT_LIBRARY "${JAVA_CROSS_HOME}/lib/libawt.so") +else() + SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-arm64") + SET(JAVA_JVM_LIBRARY "${JAVA_CROSS_HOME}/jre/lib/aarch64/server/libjvm.so") + SET(JAVA_AWT_LIBRARY "${JAVA_CROSS_HOME}/jre/lib/aarch64/libawt.so") +endif() SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include") SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include") SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux") -SET(JAVA_JVM_LIBRARY "${JAVA_CROSS_HOME}/lib/server/libjvm.so") -SET(JAVA_AWT_LIBRARY "${JAVA_CROSS_HOME}/lib/libawt.so") - # Only on aarch64 & armhf architecture set(CMAKE_THREAD_LIBS_INIT "-lpthread") diff --git a/.github/workflows/toolchains/toolchain_armhf.cmake b/.github/workflows/toolchains/toolchain_armhf.cmake index aa30ccd..5c4a5c0 100644 --- a/.github/workflows/toolchains/toolchain_armhf.cmake +++ b/.github/workflows/toolchains/toolchain_armhf.cmake @@ -54,7 +54,11 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) #include_directories("${CROSS_OPENJDK_PATH}/include/linux") SET(JAVA_HOME "/usr/lib/jvm/default-java/") -SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-armhf") +if(EXISTS "/usr/lib/jvm/java-17-openjdk-armhf") + SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-armhf") +else() + SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-armhf") +endif() SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include") SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include") SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux") diff --git a/.github/workflows/toolchains/toolchain_i386.cmake b/.github/workflows/toolchains/toolchain_i386.cmake index 4808e2a..99fe9c7 100644 --- a/.github/workflows/toolchains/toolchain_i386.cmake +++ b/.github/workflows/toolchains/toolchain_i386.cmake @@ -54,7 +54,11 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) #include_directories("${CROSS_OPENJDK_PATH}/include/linux") SET(JAVA_HOME "/usr/lib/jvm/default-java/") -SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-i386") +if(EXISTS "/usr/lib/jvm/java-17-openjdk-i386") + SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-i386") +else() + SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-i386") +endif() SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include") SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include") SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux") diff --git a/.github/workflows/toolchains/toolchain_ppc64le.cmake b/.github/workflows/toolchains/toolchain_ppc64le.cmake index 6bbd037..99b364c 100644 --- a/.github/workflows/toolchains/toolchain_ppc64le.cmake +++ b/.github/workflows/toolchains/toolchain_ppc64le.cmake @@ -54,7 +54,11 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) #include_directories("${CROSS_OPENJDK_PATH}/include/linux") SET(JAVA_HOME "/usr/lib/jvm/default-java/") -SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-ppc64el") +if(EXISTS "/usr/lib/jvm/java-17-openjdk-ppc64el") + SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-ppc64el") +else() + SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-ppc64el") +endif() SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include") SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include") SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux") diff --git a/.github/workflows/toolchains/toolchain_riscv64.cmake b/.github/workflows/toolchains/toolchain_riscv64.cmake index 8aba82f..3e1f188 100644 --- a/.github/workflows/toolchains/toolchain_riscv64.cmake +++ b/.github/workflows/toolchains/toolchain_riscv64.cmake @@ -54,7 +54,11 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) #include_directories("${CROSS_OPENJDK_PATH}/include/linux") SET(JAVA_HOME "/usr/lib/jvm/default-java/") -SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-17-openjdk-riscv64") +if(EXISTS "/usr/lib/jvm/java-17-openjdk-riscv64") + SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-riscv64") +else() + SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-8-openjdk-riscv64") +endif() SET(JAVA_INCLUDE_PATH "${JAVA_HOME}/include") SET(JAVA_AWT_INCLUDE_PATH "${JAVA_HOME}/include") SET(JAVA_INCLUDE_PATH2 "${JAVA_HOME}/include/linux")