From de1fcdd60214f2c9c67dacdcba739909488c9946 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 7 May 2023 17:00:07 +0200 Subject: [PATCH] Absolute paths --- .github/workflows/scripts/build-linux-amd64-ssl1.sh | 4 ++-- .github/workflows/scripts/build-linux-amd64-ssl3.sh | 4 ++-- .github/workflows/scripts/build-linux-arm64-ssl1.sh | 4 ++-- .../workflows/toolchains/cmake-includes-ubuntu2004.cmake | 6 +++--- .../workflows/toolchains/cmake-includes-ubuntu2204.cmake | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/scripts/build-linux-amd64-ssl1.sh b/.github/workflows/scripts/build-linux-amd64-ssl1.sh index 31d737a..b31da28 100755 --- a/.github/workflows/scripts/build-linux-amd64-ssl1.sh +++ b/.github/workflows/scripts/build-linux-amd64-ssl1.sh @@ -8,8 +8,8 @@ rm -rf implementations/tdlight/td_tools_build implementations/tdlight/build api/ mkdir -p implementations/tdlight/build implementations/tdlight/build/td_bin/bin implementations/tdlight/td_tools_build/java/it/tdlight/jni api/src/main/java-legacy/it/tdlight/jni api/src/main/java-sealed/it/tdlight/jni natives/src/main/java/it/tdlight/jni natives/build natives/tdjni_bin natives/tdjni_docs # Default compiler -export CMAKE_C_COMPILER=clang-10 -export CMAKE_CXX_COMPILER=clang++-10 +export CMAKE_C_COMPILER="/usr/bin/ccache /usr/bin/clang-10" +export CMAKE_CXX_COMPILER="/usr/bin/ccache /usr/bin/clang++-10" # Build tdlib tools cd implementations/tdlight/td_tools_build diff --git a/.github/workflows/scripts/build-linux-amd64-ssl3.sh b/.github/workflows/scripts/build-linux-amd64-ssl3.sh index f9b066d..4b3ad97 100755 --- a/.github/workflows/scripts/build-linux-amd64-ssl3.sh +++ b/.github/workflows/scripts/build-linux-amd64-ssl3.sh @@ -8,8 +8,8 @@ rm -rf implementations/tdlight/td_tools_build implementations/tdlight/build api/ mkdir -p implementations/tdlight/build implementations/tdlight/build/td_bin/bin implementations/tdlight/td_tools_build/java/it/tdlight/jni api/src/main/java-legacy/it/tdlight/jni api/src/main/java-sealed/it/tdlight/jni natives/src/main/java/it/tdlight/jni natives/build natives/tdjni_bin natives/tdjni_docs # Default compiler -export CMAKE_C_COMPILER=clang-14 -export CMAKE_CXX_COMPILER=clang++-14 +export CMAKE_C_COMPILER="/usr/bin/ccache /usr/bin/clang-14" +export CMAKE_CXX_COMPILER="/usr/bin/ccache /usr/bin/clang++-14" # Build tdlib tools cd implementations/tdlight/td_tools_build diff --git a/.github/workflows/scripts/build-linux-arm64-ssl1.sh b/.github/workflows/scripts/build-linux-arm64-ssl1.sh index 1c10055..8806dec 100755 --- a/.github/workflows/scripts/build-linux-arm64-ssl1.sh +++ b/.github/workflows/scripts/build-linux-arm64-ssl1.sh @@ -9,8 +9,8 @@ rm -rf implementations/tdlight/td_tools_build implementations/tdlight/build api/ mkdir -p implementations/tdlight/build implementations/tdlight/build/td_bin/bin implementations/tdlight/td_tools_build/java/it/tdlight/jni api/src/main/java-legacy/it/tdlight/jni api/src/main/java-sealed/it/tdlight/jni natives/src/main/java/it/tdlight/jni natives/build natives/tdjni_bin natives/tdjni_docs # Default compiler -export CMAKE_C_COMPILER=clang-10 -export CMAKE_CXX_COMPILER=clang++-10 +export CMAKE_C_COMPILER="/usr/bin/ccache /usr/bin/clang-10" +export CMAKE_CXX_COMPILER="/usr/bin/ccache /usr/bin/clang++-10" # Build tdlib tools cd implementations/tdlight/td_tools_build diff --git a/.github/workflows/toolchains/cmake-includes-ubuntu2004.cmake b/.github/workflows/toolchains/cmake-includes-ubuntu2004.cmake index 4bf2a92..e29dce3 100644 --- a/.github/workflows/toolchains/cmake-includes-ubuntu2004.cmake +++ b/.github/workflows/toolchains/cmake-includes-ubuntu2004.cmake @@ -1,8 +1,8 @@ SET(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_C_COMPILER clang-10) -set(CMAKE_CXX_COMPILER clang++-10) -set(CMAKE_AR llvm-ar-10) +set(CMAKE_C_COMPILER "/usr/bin/ccache /usr/bin/clang-10") +set(CMAKE_CXX_COMPILER "/usr/bin/ccache /usr/bin/clang++-10") +set(CMAKE_AR /usr/bin/llvm-ar-10) # Set various compiler flags set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-psabi --specs=nosys.specs -fdata-sections -ffunction-sections -Wl,--gc-sections") diff --git a/.github/workflows/toolchains/cmake-includes-ubuntu2204.cmake b/.github/workflows/toolchains/cmake-includes-ubuntu2204.cmake index 58855f5..268ebf3 100644 --- a/.github/workflows/toolchains/cmake-includes-ubuntu2204.cmake +++ b/.github/workflows/toolchains/cmake-includes-ubuntu2204.cmake @@ -1,8 +1,8 @@ SET(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_C_COMPILER clang-14) -set(CMAKE_CXX_COMPILER clang++-14) -set(CMAKE_AR llvm-ar-14) +set(CMAKE_C_COMPILER "/usr/bin/ccache /usr/bin/clang-14") +set(CMAKE_CXX_COMPILER "/usr/bin/ccache /usr/bin/clang++-14") +set(CMAKE_AR /usr/bin/llvm-ar-14) # Set various compiler flags set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-psabi --specs=nosys.specs -fdata-sections -ffunction-sections -Wl,--gc-sections")