From e81530360540d3812ecea8fcd3c242bee7a6616e Mon Sep 17 00:00:00 2001 From: Clickot Date: Thu, 25 Jan 2024 23:49:05 +0100 Subject: [PATCH] - completely rely on google's prebuilt rust/clang tools - cleanup of patches, build and docker files --- build.sh | 65 +++++----- docker-build.sh | 11 +- docker/build.Dockerfile | 48 +------- flags.gn | 4 +- patches/REVERT-clang-version-check.patch | 16 --- ...ERT-disable-autoupgrading-debug-info.patch | 48 -------- .../add_casts_in_static_initializers.patch | 111 ------------------ .../av1_vaapi_video_encoder_delegate.patch | 11 -- ...ble-GlobalMediaControlsCastStartStop.patch | 12 -- patches/icu-74.patch | 21 ++++ patches/rust-version-check.patch | 11 -- 11 files changed, 65 insertions(+), 293 deletions(-) delete mode 100644 patches/REVERT-clang-version-check.patch delete mode 100644 patches/REVERT-disable-autoupgrading-debug-info.patch delete mode 100644 patches/add_casts_in_static_initializers.patch delete mode 100644 patches/av1_vaapi_video_encoder_delegate.patch delete mode 100644 patches/disable-GlobalMediaControlsCastStartStop.patch create mode 100644 patches/icu-74.patch delete mode 100644 patches/rust-version-check.patch diff --git a/build.sh b/build.sh index d932081..7d84016 100755 --- a/build.sh +++ b/build.sh @@ -10,15 +10,6 @@ build_dir="${root_dir}/build" download_cache="${build_dir}/download_cache" src_dir="${build_dir}/src" -# env vars -# ================================================== -export LLVM_VERSION=${LLVM_VERSION:=16} -export AR=${AR:=llvm-ar-${LLVM_VERSION}} -export NM=${NM:=llvm-nm-${LLVM_VERSION}} -export CC=${CC:=clang-${LLVM_VERSION}} -export CXX=${CXX:=clang++-${LLVM_VERSION}} -export LLVM_BIN=${LLVM_BIN:=/usr/lib/llvm-${LLVM_VERSION}/bin} - # clean # ================================================== echo "cleaning up directories" @@ -37,46 +28,52 @@ mkdir -p "${src_dir}/out/Default" "${download_cache}" "${main_repo}/utils/patches.py" apply "${src_dir}" "${main_repo}/patches" "${main_repo}/utils/domain_substitution.py" apply -r "${main_repo}/domain_regex.list" -f "${main_repo}/domain_substitution.list" -c "${build_dir}/domsubcache.tar.gz" "${src_dir}" -## apply own patches needed for build cd "${src_dir}" -# revert addition of check for a certain llvm package version (seems to be introduced in chromium 107.xx) -patch -Rp1 -i ${patches_dir}/REVERT-clang-version-check.patch -# hack to disable rust version check (introduced with chromium 115.xx) -patch -Np1 -i ${patches_dir}/rust-version-check.patch -# revert addition of compiler flag that needs newer clang (taken from ungoogled-chromium-archlinux) -patch -Rp1 -i ${patches_dir}/REVERT-disable-autoupgrading-debug-info.patch + +## apply the patches from ungoogled-chromium-archlinux repo # use the --oauth2-client-id= and --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID -# and GOOGLE_DEFAULT_CLIENT_SECRET at runtime (taken from ungoogled-chromium-archlinux) +# and GOOGLE_DEFAULT_CLIENT_SECRET at runtime (taken from ungoogled-chromium-archlinux repo) patch -Np1 -i ${patches_dir}/use-oauth2-client-switches-as-default.patch -# Disable kGlobalMediaControlsCastStartStop by default -# https://crbug.com/1314342 -patch -Np1 -i ${patches_dir}/disable-GlobalMediaControlsCastStartStop.patch -# fix missing includes in av1_vaapi_video_encoder_delegate.cc -patch -Np1 -i ${patches_dir}/av1_vaapi_video_encoder_delegate.patch -# fix compile error concerning narrowing from/to int/long/unsigned in static initializer (new since latest clang-18 version) -patch -Np1 -i ${patches_dir}/add_casts_in_static_initializers.patch +# Fix build with ICU 74 (taken from ungoogled-chromium-archlinux repo) +patch -Np1 -i ${patches_dir}/icu-74.patch + +# combine local and ungoogled-chromium gn flags +cat "${main_repo}/flags.gn" "${root_dir}/flags.gn" >"${src_dir}/out/Default/args.gn" + +# adjust host name to download prebuilt tools below and sysroot files from +# (see e.g. https://github.com/ungoogled-software/ungoogled-chromium/issues/1846) +sed -i 's/commondatastorage.9oo91eapis.qjz9zk/commondatastorage.googleapis.com/g' ./build/linux/sysroot_scripts/sysroots.json +sed -i 's/commondatastorage.9oo91eapis.qjz9zk/commondatastorage.googleapis.com/g' ./tools/clang/scripts/update.py + +## use prebuilt tools for rust and clang insetad of system libs +# use prebuilt rust +./tools/rust/update_rust.py +# to link to rust libraries we need to compile with prebuilt clang +./tools/clang/scripts/update.py +# install sysroot if according gn flag is present +if grep -q -F "use_sysroot=true" "${src_dir}/out/Default/args.gn"; then + ./build/linux/sysroot_scripts/install-sysroot.py --arch=amd64 +fi ## Link to system tools required by the build mkdir -p third_party/node/linux/node-linux-x64/bin && ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin ### build # ================================================== +_clang_path="${src_dir}/third_party/llvm-build/Release+Asserts/bin" +## env vars +export CC=$_clang_path/clang +export CXX=$_clang_path/clang++ +export AR=$_clang_path/llvm-ar +export NM=$_clang_path/llvm-nm +export LLVM_BIN=${_clang_path} ## flags llvm_resource_dir=$("$CC" --print-resource-dir) export CXXFLAGS+=" -resource-dir=${llvm_resource_dir} -B${LLVM_BIN}" export CPPFLAGS+=" -resource-dir=${llvm_resource_dir} -B${LLVM_BIN}" export CFLAGS+=" -resource-dir=${llvm_resource_dir} -B${LLVM_BIN}" -# -cat "${main_repo}/flags.gn" "${root_dir}/flags.gn" >"${src_dir}/out/Default/args.gn" - -# install sysroot if according gn flag is present -if grep -q -F "use_sysroot=true" "${src_dir}/out/Default/args.gn"; then - # adjust host name to download sysroot files from (see e.g. https://github.com/ungoogled-software/ungoogled-chromium/issues/1846) - sed -i 's/commondatastorage.9oo91eapis.qjz9zk/commondatastorage.googleapis.com/g' ./build/linux/sysroot_scripts/sysroots.json - ./build/linux/sysroot_scripts/install-sysroot.py --arch=amd64 -fi -## execute build +# execute build ./tools/gn/bootstrap/bootstrap.py -o out/Default/gn --skip-generate-buildfiles ./out/Default/gn gen out/Default --fail-on-unused-args diff --git a/docker-build.sh b/docker-build.sh index bd9907f..bd9c175 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -4,17 +4,16 @@ BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" GIT_SUBMODULE="ungoogled-chromium" RELEASE=${1:-'bullseye'} -LLVM_VERSION=${2:-'18'} -REPO_POSTFIX="-$LLVM_VERSION" -[ "$LLVM_VERSION" -lt "18" ] || REPO_POSTFIX="" +NODE_VERSION=${2:-'18'} +LLVM_VERSION=${3:-'18'} -IMAGE="chromium-builder-${RELEASE}:llvm-${LLVM_VERSION}" +IMAGE="chromium-builder:${RELEASE}" echo "===============================================================" echo " build docker image '${IMAGE}'" echo "===============================================================" -(cd $BASE_DIR/docker && docker buildx build -t ${IMAGE} -f ./build.Dockerfile --build-arg RELEASE=${RELEASE} --build-arg LLVM_VERSION=${LLVM_VERSION} --build-arg REPO_POSTFIX=${REPO_POSTFIX} .) +(cd $BASE_DIR/docker && docker buildx build -t ${IMAGE} -f ./build.Dockerfile --build-arg RELEASE=${RELEASE} --build-arg NODE_VERSION=${NODE_VERSION} .) [ -n "$(ls -A ${BASE_DIR}/${GIT_SUBMODULE})" ] || git submodule update --init --recursive @@ -23,7 +22,7 @@ echo "===============================================================" echo " docker build start at ${BUILD_START}" echo "===============================================================" -cd ${BASE_DIR} && docker run -it -v ${BASE_DIR}:/repo ${IMAGE} /bin/bash -c "/repo/build.sh" +cd ${BASE_DIR} && docker run -it -v ${BASE_DIR}:/repo ${IMAGE} /bin/bash -c "LLVM_VERSION=${LLVM_VERSION} /repo/build.sh" BUILD_END=$(date) echo "===============================================================" diff --git a/docker/build.Dockerfile b/docker/build.Dockerfile index b4a17d4..b7b0b66 100644 --- a/docker/build.Dockerfile +++ b/docker/build.Dockerfile @@ -3,58 +3,22 @@ ARG RELEASE="bullseye" FROM debian:${RELEASE} ARG RELEASE -ARG LLVM_VERSION="17" ARG NODE_VERSION="18" -ARG REPO_POSTFIX="-${LLVM_VERSION}" - -# set llvm version as env var to make it available for containers building chromium -ENV LLVM_VERSION ${LLVM_VERSION} # set deb to non-interactive mode and upgrade packages RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && export DEBIAN_FRONTEND=noninteractive -RUN apt -y update && apt -y upgrade +RUN apt-get -y update && apt-get -y upgrade # install the needed base packages to add repos -RUN apt -y install lsb-release wget software-properties-common gnupg -# add node repo (needed for bullseye) +RUN apt-get -y install lsb-release wget software-properties-common gnupg + +# add node repo (needed for bullseye to install nodejs > 12) RUN wget -qO - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | tee /etc/apt/trusted.gpg.d/deb.nodesource.com.asc \ && add-apt-repository "deb https://deb.nodesource.com/node_${NODE_VERSION}.x ${RELEASE} main" -# add lvm repo -RUN wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \ - && add-apt-repository "deb http://apt.llvm.org/${RELEASE} llvm-toolchain-${RELEASE}${REPO_POSTFIX} main" -RUN apt -y update +RUN apt-get -y update && apt-get -y install nodejs && npm update -g npm -# install node and llvm toolchain -#RUN apt -y install nodejs npm clang-${LLVM_VERSION} lldb-${LLVM_VERSION} lld-${LLVM_VERSION} clangd-${LLVM_VERSION} -RUN apt -y install nodejs clang-${LLVM_VERSION} lldb-${LLVM_VERSION} lld-${LLVM_VERSION} clangd-${LLVM_VERSION} # install all remaining needed distro packages -RUN apt -y install bison debhelper desktop-file-utils flex gperf gsettings-desktop-schemas-dev imagemagick libasound2-dev libavcodec-dev libavformat-dev libavutil-dev libcap-dev libcups2-dev libcurl4-openssl-dev libdrm-dev libegl1-mesa-dev libelf-dev libevent-dev libexif-dev libflac-dev libgbm-dev libgcrypt20-dev libgl1-mesa-dev libgles2-mesa-dev libglew-dev libglib2.0-dev libglu1-mesa-dev libgtk-3-dev libhunspell-dev libjpeg-dev libjs-jquery-flot libjsoncpp-dev libkrb5-dev liblcms2-dev libminizip-dev libmodpbase64-dev libnspr4-dev libnss3-dev libopenjp2-7-dev libopus-dev libpam0g-dev libpci-dev libpipewire-0.3-dev libpng-dev libpulse-dev libre2-dev libsnappy-dev libspeechd-dev libudev-dev libusb-1.0-0-dev libva-dev libvpx-dev libwebp-dev libx11-xcb-dev libxcb-dri3-dev libxshmfence-dev libxslt1-dev libxss-dev libxt-dev libxtst-dev mesa-common-dev ninja-build pkg-config python3-jinja2 python3-setuptools python3-xcbgen python-is-python3 qtbase5-dev uuid-dev valgrind wdiff x11-apps xcb-proto xfonts-base xvfb xz-utils yasm -# update npm -RUN npm update -g npm - -# setup alternatives -RUN < -Date: Tue, 25 Apr 2023 03:05:19 +0000 -Subject: [PATCH] Reland [clang] Disable autoupgrading debug info in ThinLTO - builds - -ThinLTO reads bitcode many times and attempts to upgrade the debug info every time. This is expensive since it calls the verifier. We don't need this given all LLVM bitcode producers are from the same version of LLVM. - -For just the build step that runs ThinLTO and links official Chrome, measured 34T -> 32T instructions via perf stat. - -Reland disables adding flag for ChromeOS since that toolchain is too old to have this flag. - -Bug: 972449 -Change-Id: I44552dd6c9dc71683c002d0c885e78b2a4341659 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4470209 -Reviewed-by: Nico Weber -Commit-Queue: Arthur Eubanks -Cr-Commit-Position: refs/heads/main@{#1135007} ---- - build/config/compiler/BUILD.gn | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 1c13bc80f0f..53db095c1b1 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -768,6 +768,7 @@ - ldflags += [ - "/opt:lldltojobs=all", - "-mllvm:-import-instr-limit=$import_instr_limit", -+ "-mllvm:-disable-auto-upgrade-debug-info", - ] - } else { - ldflags += [ "-flto=thin" ] -@@ -799,6 +800,13 @@ - if (is_apple) { - ldflags += [ "-Wcrl,object_path_lto" ] - } -+ if (!is_chromeos) { -+ # TODO(https://crbug.com/972449): turn on for ChromeOS when that -+ # toolchain has this flag. -+ # We only use one version of LLVM within a build so there's no need to -+ # upgrade debug info, which can be expensive since it runs the verifier. -+ ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ] -+ } - } - - # TODO(https://crbug.com/1211155): investigate why this isn't effective on diff --git a/patches/add_casts_in_static_initializers.patch b/patches/add_casts_in_static_initializers.patch deleted file mode 100644 index 411115d..0000000 --- a/patches/add_casts_in_static_initializers.patch +++ /dev/null @@ -1,111 +0,0 @@ ---- a/components/power_metrics/energy_metrics_provider_linux.cc -+++ b/components/power_metrics/energy_metrics_provider_linux.cc -@@ -61,9 +61,9 @@ - // value of less than 1. Here, we only consider cpu0. See details in - // https://man7.org/linux/man-pages/man2/perf_event_open.2.html. - base::ScopedFD OpenPerfEvent(perf_event_attr* perf_attr) { -- base::ScopedFD perf_fd{syscall(__NR_perf_event_open, perf_attr, /*pid=*/-1, -+ base::ScopedFD perf_fd{(int)syscall(__NR_perf_event_open, perf_attr, /*pid=*/-1, - /*cpu=*/0, /*group_fd=*/-1, -- PERF_FLAG_FD_CLOEXEC)}; -+ PERF_FLAG_FD_CLOEXEC)}; - return perf_fd; - } - ---- a/third_party/webrtc/pc/legacy_stats_collector.cc -+++ b/third_party/webrtc/pc/legacy_stats_collector.cc -@@ -188,9 +188,9 @@ - {StatsReport::kStatsValueNameAccelerateRate, info.accelerate_rate}, - {StatsReport::kStatsValueNamePreemptiveExpandRate, - info.preemptive_expand_rate}, -- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_output_energy}, -+ {StatsReport::kStatsValueNameTotalAudioEnergy, (float)info.total_output_energy}, - {StatsReport::kStatsValueNameTotalSamplesDuration, -- info.total_output_duration}}; -+ (float)info.total_output_duration}}; - - const IntForAdd ints[] = { - {StatsReport::kStatsValueNameCurrentDelayMs, info.delay_estimate_ms}, -@@ -244,9 +244,9 @@ - SetAudioProcessingStats(report, info.apm_statistics); - - const FloatForAdd floats[] = { -- {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy}, -+ {StatsReport::kStatsValueNameTotalAudioEnergy, (float)info.total_input_energy}, - {StatsReport::kStatsValueNameTotalSamplesDuration, -- info.total_input_duration}}; -+ (float)info.total_input_duration}}; - - RTC_DCHECK_GE(info.audio_level, 0); - const IntForAdd ints[] = { -@@ -340,7 +340,7 @@ - {StatsReport::kStatsValueNamePlisSent, info.plis_sent}, - {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms}, - {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms}, -- {StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded}, -+ {StatsReport::kStatsValueNameFramesDecoded, (int)info.frames_decoded}, - }; - - for (const auto& i : ints) -@@ -384,15 +384,15 @@ - info.encode_usage_percent}, - {StatsReport::kStatsValueNameFirsReceived, info.firs_received}, - {StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height}, -- {StatsReport::kStatsValueNameFrameRateInput, round(info.framerate_input)}, -+ {StatsReport::kStatsValueNameFrameRateInput, (int)round(info.framerate_input)}, - {StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent}, - {StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width}, -- {StatsReport::kStatsValueNameNacksReceived, info.nacks_received}, -+ {StatsReport::kStatsValueNameNacksReceived, (int)info.nacks_received}, - {StatsReport::kStatsValueNamePacketsLost, info.packets_lost}, - {StatsReport::kStatsValueNamePacketsSent, info.packets_sent}, - {StatsReport::kStatsValueNamePlisReceived, info.plis_received}, -- {StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded}, -- {StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent}, -+ {StatsReport::kStatsValueNameFramesEncoded, (int)info.frames_encoded}, -+ {StatsReport::kStatsValueNameHugeFramesSent, (int)info.huge_frames_sent}, - }; - - for (const auto& i : ints) -@@ -780,19 +780,19 @@ - AddCandidateReport(remote_candidate_stats, false)->id()); - - const Int64ForAdd int64s[] = { -- {StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes}, -- {StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes}, -- {StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets}, -- {StatsReport::kStatsValueNameRtt, info.rtt}, -+ {StatsReport::kStatsValueNameBytesReceived, (long)info.recv_total_bytes}, -+ {StatsReport::kStatsValueNameBytesSent, (long)info.sent_total_bytes}, -+ {StatsReport::kStatsValueNamePacketsSent, (long)info.sent_total_packets}, -+ {StatsReport::kStatsValueNameRtt, (long)info.rtt}, - {StatsReport::kStatsValueNameSendPacketsDiscarded, -- info.sent_discarded_packets}, -+ (long)info.sent_discarded_packets}, - {StatsReport::kStatsValueNameSentPingRequestsTotal, -- info.sent_ping_requests_total}, -+ (long)info.sent_ping_requests_total}, - {StatsReport::kStatsValueNameSentPingRequestsBeforeFirstResponse, -- info.sent_ping_requests_before_first_response}, -- {StatsReport::kStatsValueNameSentPingResponses, info.sent_ping_responses}, -- {StatsReport::kStatsValueNameRecvPingRequests, info.recv_ping_requests}, -- {StatsReport::kStatsValueNameRecvPingResponses, info.recv_ping_responses}, -+ (long)info.sent_ping_requests_before_first_response}, -+ {StatsReport::kStatsValueNameSentPingResponses, (long)info.sent_ping_responses}, -+ {StatsReport::kStatsValueNameRecvPingRequests, (long)info.recv_ping_requests}, -+ {StatsReport::kStatsValueNameRecvPingResponses, (long)info.recv_ping_responses}, - }; - for (const auto& i : int64s) - report->AddInt64(i.name, i.value); - ---- a/cc/layers/mirror_layer_impl.h -+++ b/cc/layers/mirror_layer_impl.h -@@ -56,7 +56,7 @@ - private: - const char* LayerTypeAsString() const override; - viz::CompositorRenderPassId mirrored_layer_render_pass_id() const { -- return viz::CompositorRenderPassId{mirrored_layer_id()}; -+ return viz::CompositorRenderPassId{(unsigned long)mirrored_layer_id()}; - } - - int mirrored_layer_id_ = 0; diff --git a/patches/av1_vaapi_video_encoder_delegate.patch b/patches/av1_vaapi_video_encoder_delegate.patch deleted file mode 100644 index 5513bad..0000000 --- a/patches/av1_vaapi_video_encoder_delegate.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/media/gpu/vaapi/av1_vaapi_video_encoder_delegate.cc -+++ b/media/gpu/vaapi/av1_vaapi_video_encoder_delegate.cc -@@ -5,6 +5,8 @@ - #include "media/gpu/vaapi/av1_vaapi_video_encoder_delegate.h" - - #include -+#include -+#include - - #include "base/bits.h" - #include "base/logging.h" diff --git a/patches/disable-GlobalMediaControlsCastStartStop.patch b/patches/disable-GlobalMediaControlsCastStartStop.patch deleted file mode 100644 index 51dfdeb..0000000 --- a/patches/disable-GlobalMediaControlsCastStartStop.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc -index 862329ef314..47c89123876 100644 ---- a/chrome/browser/media/router/media_router_feature.cc -+++ b/chrome/browser/media/router/media_router_feature.cc -@@ -74,7 +74,7 @@ - #if BUILDFLAG(IS_CHROMEOS) - base::FEATURE_DISABLED_BY_DEFAULT); - #else -- base::FEATURE_ENABLED_BY_DEFAULT); -+ base::FEATURE_DISABLED_BY_DEFAULT); - #endif // BUILDFLAG(IS_CHROMEOS) - #endif // !BUILDFLAG(IS_ANDROID) diff --git a/patches/icu-74.patch b/patches/icu-74.patch new file mode 100644 index 0000000..efb8fb1 --- /dev/null +++ b/patches/icu-74.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/917645 +(copied patch from qtwebengine:6 - https://bugs.gentoo.org/917633) + +Quick fix for a static_assert failure with icu74. Still waiting +for a proper upstream fix and unknown if entirely right, but is +an extension of [1] (is now 48 rather than 43). + +[1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192 +--- a/third_party/blink/renderer/platform/text/text_break_iterator.cc ++++ b/third_party/blink/renderer/platform/text/text_break_iterator.cc +@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAsciiLineBreakTableLastChar + }; + // clang-format on + +-#if U_ICU_VERSION_MAJOR_NUM >= 58 ++#if U_ICU_VERSION_MAJOR_NUM >= 74 ++#define BA_LB_COUNT (U_LB_COUNT - 8) ++#elif U_ICU_VERSION_MAJOR_NUM >= 58 + #define BA_LB_COUNT (U_LB_COUNT - 3) + #else + #define BA_LB_COUNT U_LB_COUNT diff --git a/patches/rust-version-check.patch b/patches/rust-version-check.patch deleted file mode 100644 index fd57c78..0000000 --- a/patches/rust-version-check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tools/rust/update_rust.py -+++ a/tools/rust/update_rust.py -@@ -84,7 +84,7 @@ - return None - return match.group(1) - -- return None -+ return GetRustClangRevision() - - - def main():