diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a103b45e5ac..1c41776f6b4 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -550,8 +550,10 @@ jobs: - name: Set up base deps on musl if: matrix.metadata.build == 'linux-musl' run: | - ./scripts/alpine-linux-install-deps.sh + ./scripts/alpine-linux-install-deps.sh + echo "ENABLE_LLVM=0" >> $GITHUB_ENV echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV + # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - name: Set up dependencies for Mac OS run: | brew install automake @@ -796,7 +798,9 @@ jobs: if: matrix.metadata.build == 'linux-musl' run: | ./scripts/alpine-linux-install-deps.sh + echo "ENABLE_LLVM=0" >> $GITHUB_ENV echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV + # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - name: Install MSVC dev-cmd (Windows) uses: ilammy/msvc-dev-cmd@v1 if: ${{ matrix.metadata.build == 'windows-x64' }} @@ -916,7 +920,9 @@ jobs: if: matrix.build == 'linux-musl' run: | ./scripts/alpine-linux-install-deps.sh + echo "ENABLE_LLVM=0" >> $GITHUB_ENV echo "LLVM_CONFIG_PATH=/usr/bin/llvm-config-18" >> $GITHUB_ENV + # echo "RUSTFLAGS=-L/usr/lib64 -L/usr/lib" >> $GITHUB_ENV - uses: actions/download-artifact@v4 id: download with: diff --git a/Makefile b/Makefile index 2304081a8b3..09ac693f124 100644 --- a/Makefile +++ b/Makefile @@ -149,19 +149,19 @@ else ifeq ($(ENABLE_LLVM), 1) LLVM_VERSION := $(shell llvm-config --version) compilers += llvm # … or try to autodetect LLVM from `llvm-config-`. -else ifneq (, $(shell which llvm-config-15 2>/dev/null)) - LLVM_VERSION := $(shell llvm-config-15 --version) +else ifneq (, $(shell which llvm-config-18 2>/dev/null)) + LLVM_VERSION := $(shell llvm-config-18 --version) compilers += llvm - # need force LLVM_SYS_150_PREFIX, or llvm_sys will not build in the case - export LLVM_SYS_150_PREFIX = $(shell llvm-config-15 --prefix) + # need force LLVM_SYS_180_PREFIX, or llvm_sys will not build in the case + export LLVM_SYS_180_PREFIX = $(shell llvm-config-18 --prefix) else ifneq (, $(shell which llvm-config 2>/dev/null)) LLVM_VERSION := $(shell llvm-config --version) - ifneq (, $(findstring 15,$(LLVM_VERSION))) + ifneq (, $(findstring 18,$(LLVM_VERSION))) compilers += llvm - export LLVM_SYS_150_PREFIX = $(shell llvm-config --prefix) + export LLVM_SYS_180_PREFIX = $(shell llvm-config --prefix) else ifneq (, $(findstring 14,$(LLVM_VERSION))) compilers += llvm - export LLVM_SYS_150_PREFIX = $(shell llvm-config --prefix) + export LLVM_SYS_180_PREFIX = $(shell llvm-config --prefix) endif endif diff --git a/scripts/alpine-linux-install-deps.sh b/scripts/alpine-linux-install-deps.sh index 468612d2039..a83820411fc 100755 --- a/scripts/alpine-linux-install-deps.sh +++ b/scripts/alpine-linux-install-deps.sh @@ -4,4 +4,5 @@ # This script is used by the CI! apk update -apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++ pkgconfig llvm18-dev clang18-static llvm18-static +apk add bash mold make curl cmake ninja clang18 zstd-static llvm18-dev clang18-static llvm18-static ncurses-static zlib-static +ln -s /usr/bin/clang-18 /usr/bin/clang \ No newline at end of file