From dfa91a899b99b9e79008222bd59a3743bb27cdce Mon Sep 17 00:00:00 2001 From: jca Date: Fri, 17 Dec 2021 17:06:39 +0000 Subject: [PATCH] Avoid errors about clang13-only options here, to ease transition As pointed out by deraadt@ we can do better than ask people to follow instructions. Note that you still need an up-to-date clang if you update your kernel Makefiles, as those use clang13-only options. Also -Werror doesn't bring much in binutils context. It's an outdated codebase with lots of warts, which frequently breaks due to -Werror during clang updates. "This is the right fix" deraadt@ --- gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper index 37c17f4bdc8..05c857df665 100644 --- a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper +++ b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.25 2021/12/17 14:59:21 patrick Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.26 2021/12/17 17:06:39 jca Exp $ .include @@ -8,9 +8,6 @@ SUBDIRS= opcodes bfd CONF_SUBDIRS= opcodes bfd CFLAGS+= ${PIE_DEFAULT} -.if ${COMPILER_VERSION:Mclang} -CFLAGS+= -Wno-unused-but-set-variable -Wno-null-pointer-subtraction -.endif XCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" LDFLAGS="${LDSTATIC}" # This allows moving the whole binutils installation around for # testing purposes @@ -104,6 +101,7 @@ do-config: .USE sh ${.CURDIR}/configure --prefix=${PREFIX} \ --infodir='$${prefix}/share/info' \ --disable-nls --disable-gdbtk --disable-install-libbfd ${CF} \ + --disable-werror \ ${CONFIGTARGET} cd ${.OBJDIR} && \ sed -e 's,SUBDIRS *=,SUBDIRS ?=,' Makefile.tmp && \ -- 2.20.1