From 8757b125b21769332b40c98dbaf900d9a545e6fb Mon Sep 17 00:00:00 2001 From: dariaguy <61630209+dariaguy@users.noreply.github.com> Date: Mon, 25 May 2026 23:18:16 +0300 Subject: [PATCH] Remove handle-werrors target from modules/Makefile (#15257) --- README.md | 13 ++++++------- modules/Makefile | 19 +++---------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 21de64642..7442029ba 100644 --- a/README.md +++ b/README.md @@ -273,7 +273,7 @@ Tested with the following Docker image: ```sh cd /usr/src/redis- - export BUILD_TLS=yes BUILD_WITH_MODULES=yes INSTALL_RUST_TOOLCHAIN=yes DISABLE_WERRORS=yes + export BUILD_TLS=yes BUILD_WITH_MODULES=yes INSTALL_RUST_TOOLCHAIN=yes make -j "$(nproc)" all ``` @@ -339,7 +339,7 @@ Tested with the following Docker image: ```sh cd /usr/src/redis- - export BUILD_TLS=yes BUILD_WITH_MODULES=yes INSTALL_RUST_TOOLCHAIN=yes DISABLE_WERRORS=yes + export BUILD_TLS=yes BUILD_WITH_MODULES=yes INSTALL_RUST_TOOLCHAIN=yes make -j "$(nproc)" all ``` @@ -393,7 +393,7 @@ Tested with the following Docker image: ```sh cd /usr/src/redis- - export BUILD_TLS=yes BUILD_WITH_MODULES=yes INSTALL_RUST_TOOLCHAIN=yes DISABLE_WERRORS=yes + export BUILD_TLS=yes BUILD_WITH_MODULES=yes INSTALL_RUST_TOOLCHAIN=yes make -j "$(nproc)" all ``` @@ -450,7 +450,7 @@ Tested with the following Docker images: ```sh cd /usr/src/redis- - export BUILD_TLS=yes BUILD_WITH_MODULES=yes INSTALL_RUST_TOOLCHAIN=yes DISABLE_WERRORS=yes + export BUILD_TLS=yes BUILD_WITH_MODULES=yes INSTALL_RUST_TOOLCHAIN=yes make -j "$(nproc)" all ``` @@ -569,7 +569,7 @@ Tested with the following Docker images: ```sh source /etc/profile.d/gcc-toolset-13.sh cd /usr/src/redis- - export BUILD_TLS=yes BUILD_WITH_MODULES=yes INSTALL_RUST_TOOLCHAIN=yes DISABLE_WERRORS=yes + export BUILD_TLS=yes BUILD_WITH_MODULES=yes INSTALL_RUST_TOOLCHAIN=yes make -j "$(nproc)" all ``` @@ -686,7 +686,7 @@ Tested with the following Docker images: ```sh source /etc/profile.d/gcc-toolset-13.sh cd /usr/src/redis- - export BUILD_TLS=yes BUILD_WITH_MODULES=yes INSTALL_RUST_TOOLCHAIN=yes DISABLE_WERRORS=yes + export BUILD_TLS=yes BUILD_WITH_MODULES=yes INSTALL_RUST_TOOLCHAIN=yes make -j "$(nproc)" all ``` @@ -758,7 +758,6 @@ Tested with the following Docker images: export HOMEBREW_PREFIX="$(brew --prefix)" export BUILD_WITH_MODULES=yes export BUILD_TLS=yes - export DISABLE_WERRORS=yes PATH="$HOMEBREW_PREFIX/opt/libtool/libexec/gnubin:$HOMEBREW_PREFIX/opt/llvm@18/bin:$HOMEBREW_PREFIX/opt/make/libexec/gnubin:$HOMEBREW_PREFIX/opt/gnu-sed/libexec/gnubin:$HOMEBREW_PREFIX/opt/coreutils/libexec/gnubin:$PATH" export LDFLAGS="-L$HOMEBREW_PREFIX/opt/llvm@18/lib" export CPPFLAGS="-I$HOMEBREW_PREFIX/opt/llvm@18/include" diff --git a/modules/Makefile b/modules/Makefile index cba978269..667794160 100644 --- a/modules/Makefile +++ b/modules/Makefile @@ -11,7 +11,7 @@ all: prepare_source get_source: $(call submake,$@) -prepare_source: get_source handle-werrors setup_environment +prepare_source: get_source setup_environment clean: $(call submake,$@) @@ -25,7 +25,7 @@ pristine: install: $(call submake,$@) -setup_environment: install-rust handle-werrors +setup_environment: install-rust clean_environment: uninstall-rust @@ -74,17 +74,4 @@ ifeq ($(INSTALL_RUST_TOOLCHAIN),yes) fi endif -handle-werrors: get_source -ifeq ($(DISABLE_WERRORS),yes) - @echo "Disabling -Werror for all modules" - @for dir in $(SUBDIRS); do \ - echo "Processing $$dir"; \ - find $$dir/src -type f \ - \( -name "Makefile" \ - -o -name "*.mk" \ - -o -name "CMakeLists.txt" \) \ - -exec sed -i 's/-Werror//g' {} +; \ - done -endif - -.PHONY: all clean distclean install $(SUBDIRS) setup_environment clean_environment install-rust uninstall-rust handle-werrors +.PHONY: all clean distclean install $(SUBDIRS) setup_environment clean_environment install-rust uninstall-rust