Skip to content

Commit 51fc588

Browse files
committed
Update toolchains
- Update LLVM to 20.1.0. - Update mingw-w64 to the latest master version.
1 parent 5e87055 commit 51fc588

File tree

8 files changed

+17
-156
lines changed

8 files changed

+17
-156
lines changed

build/cargo-c.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ PKG := cargo-c
22
$(PKG)_WEBSITE := https://github.com/lu-zero/cargo-c
33
$(PKG)_DESCR := cargo applet to build and install C-ABI compatibile libraries
44
$(PKG)_IGNORE :=
5-
$(PKG)_VERSION := 0.10.9
6-
$(PKG)_CHECKSUM := 4542e39aa67bf8712c60f21701cc8e8b5153d0344afe1b618f121f696b578a7f
5+
$(PKG)_VERSION := 0.10.11
6+
$(PKG)_CHECKSUM := 8a6d6dc589d6d70bd7eb95971e3c608240e1f9c938dd5b54a049977333b59f05
77
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
88
$(PKG)_GH_CONF := lu-zero/cargo-c/tags,v
99
$(PKG)_TARGETS := $(BUILD)

build/overrides.mk

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,12 @@ nasm_URL := https://www.nasm.us/pub/nasm/releasebuilds/$(nasm_VERSION)/$(na
145145
nasm_URL_2 := https://sources.voidlinux.org/nasm-$(nasm_VERSION)/$(nasm_FILE)
146146

147147
# upstream version is 12.0.0
148-
# Update MinGW-w64 to be91da6
149-
# https://github.com/mingw-w64/mingw-w64/tarball/be91da60c4ae62a76099279500810c8ffbef4da1
150-
mingw-w64_VERSION := be91da6
151-
mingw-w64_CHECKSUM := c175db6f2b3978bed492a36438df176d69cf7f2e3dd0a1e21ddf65cc11d171c8
148+
# Update mingw-w64 to 2be9e0f
149+
# https://github.com/mingw-w64/mingw-w64/tarball/2be9e0f319990e48bfb0b2dd7b9e7045791b465f
150+
# Keep-in sync with:
151+
# https://github.com/mstorsjo/llvm-mingw/blob/$(llvm-mingw_VERSION)/build-mingw-w64.sh#L21
152+
mingw-w64_VERSION := 2be9e0f
153+
mingw-w64_CHECKSUM := 1eab853ae15f1ecf0ca7d87918d9482b3e4389fe778fb756c8ce071852ce3829
152154
mingw-w64_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/mingw-w64-[0-9]*.patch)))
153155
mingw-w64_SUBDIR := mingw-w64-mingw-w64-$(mingw-w64_VERSION)
154156
mingw-w64_FILE := mingw-w64-mingw-w64-$(mingw-w64_VERSION).tar.gz

build/plugins/llvm-mingw/llvm-mingw.mk

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ PKG := llvm-mingw
44
$(PKG)_WEBSITE := https://github.com/mstorsjo/llvm-mingw
55
$(PKG)_DESCR := An LLVM/Clang/LLD based mingw-w64 toolchain
66
$(PKG)_IGNORE :=
7-
# https://github.com/mstorsjo/llvm-mingw/tarball/0087c59c17cbf02066abf71bed3300ce68babc19
8-
$(PKG)_VERSION := 0087c59
9-
$(PKG)_CHECKSUM := 31f1edd73858fb9ca8e51572f2f536c1e514a04d0825793d12fe543078f1179f
7+
$(PKG)_VERSION := 20250305
8+
$(PKG)_CHECKSUM := a4d1a78a6b84304942e2cea22a9510d32e4795dcc56a335d38901dacfc35be10
109
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/llvm-mingw-[0-9]*.patch)))
11-
$(PKG)_GH_CONF := mstorsjo/llvm-mingw/branches/master
10+
$(PKG)_GH_CONF := mstorsjo/llvm-mingw/tags
1211
$(PKG)_DEPS := mingw-w64
1312

1413
# The minimum Windows version we support is Windows 7, as libc++ uses

build/plugins/llvm-mingw/llvm.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ PKG := llvm
44
$(PKG)_WEBSITE := https://llvm.org/
55
$(PKG)_DESCR := A collection of modular and reusable compiler and toolchain technologies
66
$(PKG)_IGNORE :=
7-
$(PKG)_VERSION := 19.1.7
8-
$(PKG)_CHECKSUM := 82401fea7b79d0078043f7598b835284d6650a75b93e64b6f761ea7b63097501
7+
$(PKG)_VERSION := 20.1.0
8+
$(PKG)_CHECKSUM := 4579051e3c255fb4bb795d54324f5a7f3ef79bd9181e44293d7ee9a7f62aad9a
99
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/llvm-[0-9]*.patch)))
1010
$(PKG)_GH_CONF := llvm/llvm-project/releases/latest,llvmorg-,,,,.tar.xz
1111
$(PKG)_SUBDIR := $(PKG)-project-$($(PKG)_VERSION).src
@@ -75,7 +75,6 @@ define $(PKG)_BUILD_RUNTIMES
7575
-DCMAKE_CXX_COMPILER_TARGET='$(PROCESSOR)-w64-windows-gnu' \
7676
-DCMAKE_C_COMPILER_WORKS=TRUE \
7777
-DCMAKE_CXX_COMPILER_WORKS=TRUE \
78-
-DLLVM_PATH='$(SOURCE_DIR)/llvm' \
7978
-DCMAKE_AR='$(PREFIX)/$(BUILD)/bin/llvm-ar' \
8079
-DCMAKE_RANLIB='$(PREFIX)/$(BUILD)/bin/llvm-ranlib' \
8180
-DLLVM_ENABLE_RUNTIMES='libunwind;libcxxabi;libcxx' \

build/plugins/llvm-mingw/patches/llvm-19-fixes.patch

Lines changed: 0 additions & 101 deletions
This file was deleted.

build/plugins/llvm-mingw/patches/llvm-mingw-19-fixes.patch

Lines changed: 0 additions & 38 deletions
This file was deleted.

build/plugins/llvm-mingw/rust.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ PKG := rust
22
$(PKG)_WEBSITE := https://www.rust-lang.org/
33
$(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency.
44
$(PKG)_IGNORE :=
5-
# https://static.rust-lang.org/dist/2025-02-14/rustc-nightly-src.tar.xz.sha256
5+
# https://static.rust-lang.org/dist/2025-03-05/rustc-nightly-src.tar.xz.sha256
66
$(PKG)_VERSION := nightly
7-
$(PKG)_CHECKSUM := c1eac1985eee40c828b47f4b6d3bad806bfdb1c9d1219e12135dfbf83ecdc1a3
7+
$(PKG)_CHECKSUM := 91724890f2affa47b7e8e9891c8808764beff007bdb47054aedb0d2ad2c6c8c5
88
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
99
$(PKG)_SUBDIR := $(PKG)c-$($(PKG)_VERSION)-src
1010
$(PKG)_FILE := $(PKG)c-$($(PKG)_VERSION)-src.tar.xz
11-
$(PKG)_URL := https://static.rust-lang.org/dist/2025-02-14/$($(PKG)_FILE)
11+
$(PKG)_URL := https://static.rust-lang.org/dist/2025-03-05/$($(PKG)_FILE)
1212
$(PKG)_DEPS := $(BUILD)~$(PKG)
1313
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
1414

build/plugins/llvm-mingw/test-llvm-mingw.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ define $(PKG)_BUILD
2222
HAVE_UWP= \
2323
HAVE_OPENMP= \
2424
HAVE_CFGUARD= \
25-
$(if $(IS_X86), HAVE_SANITIZERS=1) \
25+
$(if $(IS_X86), HAVE_ASAN=1) \
2626
$(if $(BUILD_SHARED), TESTS_CPP_STATIC=) \
2727
RUNTIMES_SRC='$(PREFIX)/$(TARGET)/bin' \
2828
NATIVE= \

0 commit comments

Comments
 (0)