diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template index 84549a19b0a..fe2022317ff 100644 --- a/srcpkgs/Ice/template +++ b/srcpkgs/Ice/template @@ -16,10 +16,6 @@ case "$XBPS_TARGET_MACHINE" in aarch64*) broken="https://build.voidlinux.eu/builders/aarch64-musl_builder/builds/739/steps/shell_3/logs/stdio";; esac -if [ "$XBPS_GCC_VERSION_MAJOR" -ge 8 ]; then - CXXFLAGS+=" -Wno-catch-value" -fi - if [ "$CROSS_BUILD" ]; then # Cross build requires the host's slice2cpp and slice2freeze hostmakedepends+=" Ice" @@ -43,7 +39,8 @@ do_configure() { -e "s|ifeq (\$(CXX),g++)|ifeq (\$(CXX),${CXX})|" \ -e "/CXXARCHFLAGS\s+=/ s| -m.*|${CXXFLAGS}|" \ -e "s|\$(CXX) -shared|${CXX} -shared|" \ - -e "s|-rdynamic|-rdynamic -Wl,-rpath,\$(libdir) ${LDFLAGS}|" + -e "s|-rdynamic|-rdynamic -Wl,-rpath,\$(libdir) ${LDFLAGS}|" \ + -e "s|-Werror|-Wno-error|" # Fix cross building if [ "$CROSS_BUILD" ]; then # Use host's slice2cpp and slice2freeze