From 09e938fa5d59a26b81f88587ff2cf96c1c33add2 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Mon, 8 May 2023 19:31:04 +0200 Subject: [PATCH] use cross java home, add compiler-rt and libunwind --- ...tform_natives.yaml => platform_natives.yaml.off} | 0 .../{tdapi_file.yaml => tdapi_file.yaml.off} | 0 .github/workflows/toolchains/toolchain-arm64.cmake | 13 +++++++------ 3 files changed, 7 insertions(+), 6 deletions(-) rename .github/workflows/{platform_natives.yaml => platform_natives.yaml.off} (100%) rename .github/workflows/{tdapi_file.yaml => tdapi_file.yaml.off} (100%) diff --git a/.github/workflows/platform_natives.yaml b/.github/workflows/platform_natives.yaml.off similarity index 100% rename from .github/workflows/platform_natives.yaml rename to .github/workflows/platform_natives.yaml.off diff --git a/.github/workflows/tdapi_file.yaml b/.github/workflows/tdapi_file.yaml.off similarity index 100% rename from .github/workflows/tdapi_file.yaml rename to .github/workflows/tdapi_file.yaml.off diff --git a/.github/workflows/toolchains/toolchain-arm64.cmake b/.github/workflows/toolchains/toolchain-arm64.cmake index 4f311e2..3a1b348 100644 --- a/.github/workflows/toolchains/toolchain-arm64.cmake +++ b/.github/workflows/toolchains/toolchain-arm64.cmake @@ -21,9 +21,9 @@ set(CMAKE_PROGRAM_PATH /usr/bin/aarch64-linux-gnu) # Set various compiler flags -set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld") -set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=lld") -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld") +set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind") +set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind") +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind") set(CMAKE_CXX_FLAGS_INIT "-stdlib=libc++") @@ -40,13 +40,14 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) #include_directories("${CROSS_OPENJDK_PATH}/include/linux") -SET(JAVA_HOME "/usr/lib/jvm/java-1.8.0-openjdk-arm64") +SET(JAVA_HOME "/usr/lib/jvm/default-java/") +SET(JAVA_CROSS_HOME "/usr/lib/jvm/java-1.8.0-openjdk-arm64") 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_HOME}/jre/lib/aarch64/server/libjvm.so") -SET(JAVA_AWT_LIBRARY "${JAVA_HOME}/jre/lib/aarch64/libawt.so") +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") # Only on aarch64 & armhf architecture