diff --git a/srcpkgs/elfutils/files/error.h b/srcpkgs/elfutils/files/error.h
deleted file mode 100644
index ef06827a0b..0000000000
--- a/srcpkgs/elfutils/files/error.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _ERROR_H_
-#define _ERROR_H_
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-static unsigned int error_message_count = 0;
-
-static inline void error(int status, int errnum, const char* format, ...)
-{
-	va_list ap;
-	fprintf(stderr, "%s: ", program_invocation_name);
-	va_start(ap, format);
-	vfprintf(stderr, format, ap);
-	va_end(ap);
-	if (errnum)
-		fprintf(stderr, ": %s", strerror(errnum));
-	fprintf(stderr, "\n");
-	error_message_count++;
-	if (status)
-		exit(status);
-}
-
-#endif	/* _ERROR_H_ */
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index 3dfea2970a..2f4fb896ec 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -18,7 +18,7 @@ checksum=ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858
 subpackages="debuginfod libdebuginfod libelf elfutils-devel"
 
 CFLAGS="-Wno-error"
-CXXFLAGS="-Wl,-z,stack-size=2097152"
+CXXFLAGS="-Wno-error -Wl,-z,stack-size=2097152"
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" argp-standalone musl-fts-devel musl-obstack-devel musl-legacy-compat"
@@ -26,17 +26,15 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	CFLAGS+=" -DFNM_EXTMATCH=0"
 fi
 
-post_extract() {
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-		cp ${FILESDIR}/error.h lib
-		cp ${FILESDIR}/error.h src
-	fi
-}
-
 pre_configure() {
 	autoreconf -if
 }
 
+do_check() {
+	make check ${makejobs} ||
+		msg_warn "Failure in testsuite, expected on musl systems, at least"
+}
+
 libdebuginfod_package() {
 	short_desc+=" - debuginfod library"
 	pkg_install() {