diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index a7627e7dcf2..401dabad31c 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -63,8 +63,8 @@ _EOF
 	cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
 
 	export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
-	# Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590
-	CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \
+	# Remove -pipe: https://gitlab.kitware.com/cmake/cmake/issues/19590
+	CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
 		cmake ${cmake_args} ${configure_args} ${wrksrc}/${build_wrksrc}
 
 	# Replace -isystem with -I