From f13fc27ae024caa1e9f4f809b4ef4c09f394a812 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Tue, 18 Mar 2025 16:53:10 +0000 Subject: [PATCH] Use LLVM-18 on FreeBSD --- .github/workflows/ci.yml | 2 +- .github/workflows/nightly.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae9701f96..b737a6f57 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: usesh: true copyback: false prepare: | - pkg install -y gmake git bash python3 libxml2 llvm20 + pkg install -y gmake git bash python3 libxml2 llvm18 run: | # `set -e` is needed for test failures to register. https://github.com/vmactions/freebsd-vm/issues/72 set -e -x diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f0b25ae29..80b2a72af 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -93,8 +93,8 @@ jobs: - uses: actions/checkout@v4 - name: Download LLVM and setup PATH run: | - brew install llvm@20 dylibbundler - echo "/usr/local/opt/llvm@20/bin" >> $GITHUB_PATH + brew install llvm@18 dylibbundler + echo "/usr/local/opt/llvm@18/bin" >> $GITHUB_PATH - name: build odin # These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to # not link with libunwind bundled with LLVM but link with libunwind on the system. @@ -130,8 +130,8 @@ jobs: - uses: actions/checkout@v4 - name: Download LLVM and setup PATH run: | - brew install llvm@20 dylibbundler - echo "/opt/homebrew/opt/llvm@20/bin" >> $GITHUB_PATH + brew install llvm@18 dylibbundler + echo "/opt/homebrew/opt/llvm@18/bin" >> $GITHUB_PATH - name: build odin # These -L makes the linker prioritize system libraries over LLVM libraries, this is mainly to # not link with libunwind bundled with LLVM but link with libunwind on the system.