From 2a924ae3b0e5a843d9a84b244ddaaa20449f8309 Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 14 Jan 2025 18:23:40 +0800 Subject: [PATCH] fix the link order to support LLVM_20 change (#1838) * fix the link order to support LLVM_20 change * Update CI to use LLVM 20 --------- Co-authored-by: Christoffer Lerno --- .github/workflows/main.yml | 6 +++--- CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 215457d85..43b224eae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -228,7 +228,7 @@ jobs: fail-fast: false matrix: build_type: [Release, Debug] - llvm_version: [17, 18, 19] + llvm_version: [17, 18, 19, 20] steps: - uses: actions/checkout@v4 @@ -405,7 +405,7 @@ jobs: fail-fast: false matrix: build_type: [Release, Debug] - llvm_version: [17, 18, 19] + llvm_version: [17, 18, 19, 20] steps: - uses: actions/checkout@v4 - name: Install common deps @@ -526,7 +526,7 @@ jobs: matrix: ubuntu_version: [20.04, 22.04] build_type: [Release, Debug] - llvm_version: [17, 18, 19] + llvm_version: [17, 18, 19, 20] steps: - uses: actions/checkout@v4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 22e6b540b..e4a27ed1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,11 +252,11 @@ if(C3_WITH_LLVM) find_library(LLD_LOONG NAMES libLLVMLoongArchCodeGen.lib libLLVMLoongArchAsmParser.lib libLLVMLoongArchCodeGen.a libLLVMLoongArchAsmParser.a PATHS ${LLVM_LIBRARY_DIRS} NO_DEFAULT_PATH) set(lld_libs ${LLD_COFF} - ${LLD_COMMON} ${LLD_WASM} ${LLD_MINGW} ${LLD_ELF} ${LLD_MACHO} + ${LLD_COMMON} ) if (APPLE)