From 2dd1842b68314c83baba4bef797111b86a3fed79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20L=C3=B3pez?= Date: Mon, 23 Oct 2023 13:25:43 -0300 Subject: [PATCH] ci: install clang --- .github/scripts/install-libff.sh | 5 +++-- .github/scripts/install-libsecp256k1.sh | 5 +++-- .github/workflows/ci.yml | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/scripts/install-libff.sh b/.github/scripts/install-libff.sh index a7ae0d228..915a7e8dc 100755 --- a/.github/scripts/install-libff.sh +++ b/.github/scripts/install-libff.sh @@ -37,8 +37,9 @@ fi if [ "$HOST_OS" = "Windows" ]; then ARGS+=("-G" "Ninja") sed -i 's/find_library(GMP_LIBRARY gmp)/find_library(GMP_LIBRARY NAMES libgmp.a)/' CMakeLists.txt - export CC=clang - export CXX=clang++ + export CC=/mingw64/bin/clang.exe + export CXX=/mingw64/bin/clang++.exe + export LD=/mingw64/bin/lld.exe fi mkdir -p build diff --git a/.github/scripts/install-libsecp256k1.sh b/.github/scripts/install-libsecp256k1.sh index 6e838d9d9..4c7a0049f 100755 --- a/.github/scripts/install-libsecp256k1.sh +++ b/.github/scripts/install-libsecp256k1.sh @@ -16,8 +16,9 @@ unzip "$gitRef.zip" cd "secp256k1-$gitRef" if [ "$HOST_OS" = "Windows" ]; then - export CC=clang - export CXX=clang++ + export CC=/mingw64/bin/clang.exe + export CXX=/mingw64/bin/clang++.exe + export LD=/mingw64/bin/lld.exe fi ./autogen.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9efe578f3..43b895ca1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,7 +50,8 @@ jobs: pacboy: >- cmake:p ninja:p - gcc:p + clang:p + lld:p autotools:p gmp:p openssl:p