Skip to content

Commit 65359ac

Browse files
committed
Update toolchains
- Update LLVM to 14.0.3. MXE Updates: - Update GCC to 12.1.0.
1 parent 8c586e5 commit 65359ac

File tree

8 files changed

+17
-18
lines changed

8 files changed

+17
-18
lines changed

build/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ fi
111111
if [ "$LLVM" = "true" ]; then
112112
plugins+=" $work_dir/plugins/llvm-mingw"
113113
else
114-
plugins+=" $work_dir/plugins/gcc"
114+
plugins+=" plugins/gcc12 $work_dir/plugins/gcc"
115115
fi
116116

117117
# Avoid shipping the gettext DLL (libintl-8.dll),

build/plugins/gcc/patches/gcc-11.patch renamed to build/plugins/gcc/patches/gcc-12.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7
1212

1313
clang can build it correctly and this should probably be a feature test
1414

15-
diff --git a/gcc/config/i386/driver-i386.c b/gcc/config/i386/driver-i386.c
15+
diff --git a/gcc/config/i386/driver-i386.cc b/gcc/config/i386/driver-i386.cc
1616
index 1111111..2222222 100644
17-
--- a/gcc/config/i386/driver-i386.c
18-
+++ b/gcc/config/i386/driver-i386.c
17+
--- a/gcc/config/i386/driver-i386.cc
18+
+++ b/gcc/config/i386/driver-i386.cc
1919
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3. If not see
2020

2121
const char *host_detect_local_cpu (int argc, const char **argv);

build/plugins/llvm-mingw/compiler-rt-sanitizers.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
PKG := compiler-rt-sanitizers
44
$(PKG)_WEBSITE := https://compiler-rt.llvm.org/
5-
$(PKG)_VERSION := 14.0.1
5+
$(PKG)_VERSION := 14.0.3
66
$(PKG)_DEPS := cc
77
$(PKG)_TYPE := meta
88

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ define $(PKG)_PRE_BUILD
5959
# Can't symlink here, it will break the basename detection of LLVM. See:
6060
# sys::path::stem("x86_64-w64-mingw32.shared-ranlib"); -> x86_64-w64-mingw32
6161
# TODO(kleisauke): Remove this if we omit any dots from our target, see:
62-
# https://github.com/llvm/llvm-project/blob/llvmorg-14.0.1/llvm/tools/llvm-ar/llvm-ar.cpp#L1285-L1304
62+
# https://github.com/llvm/llvm-project/blob/llvmorg-14.0.3/llvm/tools/llvm-ar/llvm-ar.cpp#L1285-L1304
6363
$(foreach EXEC, addr2line ar cvtres nm objcopy ranlib rc strings strip, \
6464
(echo '#!/bin/sh'; \
6565
echo 'exec "$(PREFIX)/$(BUILD)/bin/llvm-$(EXEC)" "$$@"') \
@@ -68,7 +68,7 @@ define $(PKG)_PRE_BUILD
6868

6969
# We need to pass some additional arguments for windres
7070
# TODO(kleisauke): Remove this if we omit any dots from our target, see:
71-
# https://github.com/llvm/llvm-project/blob/llvmorg-14.0.1/llvm/tools/llvm-rc/llvm-rc.cpp#L266-L277
71+
# https://github.com/llvm/llvm-project/blob/llvmorg-14.0.3/llvm/tools/llvm-rc/llvm-rc.cpp#L266-L277
7272
(echo '#!/bin/sh'; \
7373
echo 'exec "$(PREFIX)/$(BUILD)/bin/llvm-windres" \
7474
--preprocessor-arg="--sysroot=$(PREFIX)/$(TARGET)" \
@@ -82,7 +82,7 @@ define $(PKG)_PRE_BUILD
8282
# armv7 -> arm
8383
# aarch64 -> arm64
8484
# TODO(kleisauke): Remove this if we omit any dots from our target, see:
85-
# https://github.com/llvm/llvm-project/blob/llvmorg-14.0.1/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp#L97-L108
85+
# https://github.com/llvm/llvm-project/blob/llvmorg-14.0.3/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp#L97-L108
8686
$(eval DLLTOOL_ARCH := $(strip \
8787
$(if $(findstring i686,$(PROCESSOR)),i386, \
8888
$(if $(findstring x86_64,$(PROCESSOR)),i386:x86-64, \

build/plugins/llvm-mingw/llvm.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ $(PKG)_WEBSITE := https://llvm.org/
55
$(PKG)_DESCR := A collection of modular and reusable compiler and toolchain technologies
66
$(PKG)_IGNORE :=
77
# This version needs to be in-sync with the compiler-rt-sanitizers package
8-
$(PKG)_VERSION := 14.0.1
9-
$(PKG)_CHECKSUM := 1a3c2e57916c5a70153aaf0a0e6f1230d6368b9e0f4d04dcb9e039a31b1cd4e6
8+
$(PKG)_VERSION := 14.0.3
9+
$(PKG)_CHECKSUM := 44d3e7a784d5cf805e72853bb03f218bd1058d448c03ca883dabbebc99204e0c
1010
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/llvm-[0-9]*.patch)))
1111
$(PKG)_GH_CONF := llvm/llvm-project/releases/latest,llvmorg-,,,,.tar.xz
1212
$(PKG)_SUBDIR := $(PKG)-project-$(subst -,,$($(PKG)_VERSION)).src

build/plugins/llvm-mingw/overrides.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ IS_LLVM := $(true)
44

55
# [major].[minor].[patch]-[label] -> [major].[minor].[patch]
66
#clang_VERSION := $(firstword $(subst -, ,$(llvm_VERSION)))
7-
clang_VERSION := 14.0.1
7+
clang_VERSION := 14.0.3
88

99
# Override sub-dependencies
1010
cc_DEPS := llvm

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/2022-05-01/rustc-nightly-src.tar.gz.sha256
5+
# https://static.rust-lang.org/dist/2022-05-12/rustc-nightly-src.tar.gz.sha256
66
$(PKG)_VERSION := nightly
7-
$(PKG)_CHECKSUM := fb19f1820fd063f879f751c80a5022f894998d05028fe520a4988edb65364e1c
7+
$(PKG)_CHECKSUM := 30b3c71bc464270b4e35233a90260c5897224c6446148b79bac2164b0c9b72f2
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.gz
11-
$(PKG)_URL := https://static.rust-lang.org/dist/2022-05-01/$($(PKG)_FILE)
11+
$(PKG)_URL := https://static.rust-lang.org/dist/2022-05-12/$($(PKG)_FILE)
1212
$(PKG)_DEPS := $(BUILD)~$(PKG)
1313
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
1414

container/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ FROM buildpack-deps:bullseye
33
RUN apt-get update \
44
&& apt-get install -y \
55
# http://mxe.cc/#requirements-debian
6-
autopoint bison flex gettext gperf intltool \
7-
libtool-bin libxml-parser-perl lzip p7zip-full \
8-
ruby g++-multilib libc6-dev-i386 python3-mako \
9-
python-is-python3 \
6+
autopoint bison flex gettext gperf g++-multilib \
7+
intltool libc6-dev-i386 libtool-bin libxml-parser-perl \
8+
lzip p7zip-full python-is-python3 python3-mako ruby texinfo \
109
# needed when building libvips from git
1110
gobject-introspection gtk-doc-tools
1211

0 commit comments

Comments
 (0)