Update toolchains

- Update LLVM to 14.0.5.

Author: kleisauke

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

@@ -2,17 +2,19 @@
 
 PKG             := compiler-rt-sanitizers
 $(PKG)_WEBSITE  := https://compiler-rt.llvm.org/
-$(PKG)_VERSION  := 14.0.4
+$(PKG)_VERSION  := 14.0.5
 $(PKG)_DEPS     := cc
 $(PKG)_TYPE     := meta
 
 # Note: Ubsan includes <typeinfo> from the C++ headers, so
 # this has to be built after libcxx.
 define $(PKG)_BUILD
+    $(eval CLANG_RESOURCE_DIR := $(shell $(PREFIX)/$(BUILD)/bin/clang --print-resource-dir))
+
     $(call PREPARE_PKG_SOURCE,llvm,$(SOURCE_DIR))
 
     cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)/$(llvm_SUBDIR)/compiler-rt' \
-        -DCMAKE_INSTALL_PREFIX='$(PREFIX)/$(BUILD)/lib/clang/$(clang_VERSION)' \
+        -DCMAKE_INSTALL_PREFIX='$(CLANG_RESOURCE_DIR)' \
         -DCMAKE_AR='$(PREFIX)/$(BUILD)/bin/llvm-ar' \
         -DCMAKE_RANLIB='$(PREFIX)/$(BUILD)/bin/llvm-ranlib' \
         -DCMAKE_C_COMPILER_TARGET='$(PROCESSOR)-windows-gnu' \
@@ -27,7 +29,7 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
     $(MAKE) -C '$(BUILD_DIR)' -j 1 $(subst -,/,$(INSTALL_STRIP_TOOLCHAIN))
 
-    mv -v '$(PREFIX)/$(BUILD)/lib/clang/$(clang_VERSION)/lib/windows/'*.dll '$(PREFIX)/$(TARGET)/bin/'
+    mv -v '$(CLANG_RESOURCE_DIR)/lib/windows/'*.dll '$(PREFIX)/$(TARGET)/bin/'
 endef
 
 # Sanitizers on windows only support x86.

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

@@ -4,9 +4,9 @@ PKG             := llvm-mingw
 $(PKG)_WEBSITE  := https://github.com/mstorsjo/llvm-mingw
 $(PKG)_DESCR    := An LLVM/Clang/LLD based mingw-w64 toolchain
 $(PKG)_IGNORE   :=
-# https://github.com/mstorsjo/llvm-mingw/tarball/83d84ab79b42b267948f7fbbbd99065ec781fb5f
-$(PKG)_VERSION  := 83d84ab
-$(PKG)_CHECKSUM := 7519fa5271a07ea3a617ca36c098fe6fd11453b48706dbdc9236fd1ffd152ef3
+# https://github.com/mstorsjo/llvm-mingw/tarball/eac1db1c0ddbd0ec61601284048e9ade92a26542
+$(PKG)_VERSION  := eac1db1
+$(PKG)_CHECKSUM := bdcf863f270dddc28c5ca3cccbb05a3b668ca81c645bc8ce1665ed8be86417c1
 # TODO(kleisauke): Remove this if we omit any dots from our target
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/llvm-mingw-[0-9]*.patch)))
 $(PKG)_GH_CONF  := mstorsjo/llvm-mingw/branches/master
@@ -59,7 +59,7 @@ define $(PKG)_PRE_BUILD
     # Can't symlink here, it will break the basename detection of LLVM. See:
     # sys::path::stem("x86_64-w64-mingw32.shared-ranlib"); -> x86_64-w64-mingw32
     # TODO(kleisauke): Remove this if we omit any dots from our target, see:
-    # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.4/llvm/tools/llvm-ar/llvm-ar.cpp#L1285-L1304
+    # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.5/llvm/tools/llvm-ar/llvm-ar.cpp#L1285-L1304
     $(foreach EXEC, addr2line ar cvtres nm objcopy ranlib rc strings strip, \
         (echo '#!/bin/sh'; \
          echo 'exec "$(PREFIX)/$(BUILD)/bin/llvm-$(EXEC)" "$$@"') \
@@ -68,7 +68,7 @@ define $(PKG)_PRE_BUILD
 
     # We need to pass some additional arguments for windres
     # TODO(kleisauke): Remove this if we omit any dots from our target, see:
-    # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.4/llvm/tools/llvm-rc/llvm-rc.cpp#L266-L277
+    # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.5/llvm/tools/llvm-rc/llvm-rc.cpp#L266-L277
     (echo '#!/bin/sh'; \
      echo 'exec "$(PREFIX)/$(BUILD)/bin/llvm-windres" \
          --preprocessor-arg="--sysroot=$(PREFIX)/$(TARGET)" \
@@ -82,7 +82,7 @@ define $(PKG)_PRE_BUILD
     # armv7 -> arm
     # aarch64 -> arm64
     # TODO(kleisauke): Remove this if we omit any dots from our target, see:
-    # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.4/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp#L97-L108
+    # https://github.com/llvm/llvm-project/blob/llvmorg-14.0.5/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp#L97-L108
     $(eval DLLTOOL_ARCH := $(strip \
         $(if $(findstring i686,$(PROCESSOR)),i386, \
         $(if $(findstring x86_64,$(PROCESSOR)),i386:x86-64, \
@@ -100,7 +100,7 @@ define $(PKG)_PRE_BUILD
                   -e 's|^DIR=.*|DIR="$(PREFIX)/$(TARGET)/bin"|' '$(SOURCE_DIR)/wrappers/$(EXEC)-wrapper.sh'; \
         $(INSTALL) -m755 '$(SOURCE_DIR)/wrappers/$(EXEC)-wrapper.sh' '$(PREFIX)/$(TARGET)/bin';)
 
-    $(foreach EXEC, clang clang++ gcc g++ cc c99 c11 c++, \
+    $(foreach EXEC, clang clang++ gcc g++ c++, \
         ln -sf '$(PREFIX)/$(TARGET)/bin/clang-target-wrapper.sh' '$(PREFIX)/bin/$(TARGET)-$(EXEC)';)
 
     $(foreach EXEC, ld objdump, \

build/plugins/llvm-mingw/llvm.mk

@@ -5,8 +5,8 @@ $(PKG)_WEBSITE  := https://llvm.org/
 $(PKG)_DESCR    := A collection of modular and reusable compiler and toolchain technologies
 $(PKG)_IGNORE   :=
 # This version needs to be in-sync with the compiler-rt-sanitizers package
-$(PKG)_VERSION  := 14.0.4
-$(PKG)_CHECKSUM := f40c77ceff02ae3873d273a51b0f93cd8e6409576f771d860d75835335522052
+$(PKG)_VERSION  := 14.0.5
+$(PKG)_CHECKSUM := c9d27903ba3883c476a83cd515e36e1e07b0585db55692835de11385d9e3c8fa
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/llvm-[0-9]*.patch)))
 $(PKG)_GH_CONF  := llvm/llvm-project/releases/latest,llvmorg-,,,,.tar.xz
 $(PKG)_SUBDIR   := $(PKG)-project-$(subst -,,$($(PKG)_VERSION)).src
@@ -54,9 +54,11 @@ define $(PKG)_BUILD_$(BUILD)
 endef
 
 define $(PKG)_BUILD_COMPILER_RT
+    $(eval CLANG_RESOURCE_DIR := $(shell $(PREFIX)/$(BUILD)/bin/clang --print-resource-dir))
+
     mkdir '$(BUILD_DIR).compiler-rt'
     cd '$(BUILD_DIR).compiler-rt' && $(TARGET)-cmake '$(SOURCE_DIR)/compiler-rt/lib/builtins' \
-        -DCMAKE_INSTALL_PREFIX='$(PREFIX)/$(BUILD)/lib/clang/$(clang_VERSION)' \
+        -DCMAKE_INSTALL_PREFIX='$(CLANG_RESOURCE_DIR)' \
         -DCMAKE_AR='$(PREFIX)/$(BUILD)/bin/llvm-ar' \
         -DCMAKE_RANLIB='$(PREFIX)/$(BUILD)/bin/llvm-ranlib' \
         -DCMAKE_C_COMPILER_TARGET='$(PROCESSOR)-windows-gnu' \

build/plugins/llvm-mingw/overrides.mk

@@ -2,10 +2,6 @@ $(PLUGIN_HEADER)
 
 IS_LLVM := $(true)
 
-# [major].[minor].[patch]-[label] -> [major].[minor].[patch]
-#clang_VERSION := $(firstword $(subst -, ,$(llvm_VERSION)))
-clang_VERSION := 14.0.4
-
 # Override sub-dependencies
 cc_DEPS := llvm
 

build/plugins/llvm-mingw/rust.mk

@@ -2,13 +2,13 @@ PKG             := rust
 $(PKG)_WEBSITE  := https://www.rust-lang.org/
 $(PKG)_DESCR    := A systems programming language focused on safety, speed and concurrency.
 $(PKG)_IGNORE   :=
-# https://static.rust-lang.org/dist/2022-06-05/rustc-nightly-src.tar.xz.sha256
+# https://static.rust-lang.org/dist/2022-06-13/rustc-nightly-src.tar.xz.sha256
 $(PKG)_VERSION  := nightly
-$(PKG)_CHECKSUM := 35295830e5072f343393d977a021f67e7050bad05fa2d58a56b43c8b4208731a
+$(PKG)_CHECKSUM := d78ac20cae80390dd2d075255ff77800e1fb9e4cea3c8a2bad1dd5ae57441a70
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
 $(PKG)_SUBDIR   := $(PKG)c-$($(PKG)_VERSION)-src
 $(PKG)_FILE     := $(PKG)c-$($(PKG)_VERSION)-src.tar.xz
-$(PKG)_URL      := https://static.rust-lang.org/dist/2022-06-05/$($(PKG)_FILE)
+$(PKG)_URL      := https://static.rust-lang.org/dist/2022-06-13/$($(PKG)_FILE)
 $(PKG)_DEPS     := $(BUILD)~$(PKG)
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)