There are some instances under src/gnu of Makefile.bsd-wrapper
failing to pass variables like CC to a configure script. As a
result, the configure tests are actually run with gcc (!) on amd64
and i386. The patch below fixes
lib/libiberty
usr.bin/binutils
usr.bin/binutils-2.17
usr.bin/cvs
to use CC/CFLAGS for configure.
The diff does not touch these other Makefile.bsd-wrapper files:
lib/libobjc/Makefile.bsd-wrapper unused
lib/libstdc++/Makefile.bsd-wrapper GCC3 cruft
usr.bin/gcc/Makefile.bsd-wrapper GCC3 cruft
usr.bin/perl/Makefile.bsd-wrapper not GNU autoconf
usr.bin/texinfo/Makefile.bsd-wrapper already correct
Index: lib/libiberty/Makefile.bsd-wrapper
===================================================================
RCS file: /cvs/src/gnu/lib/libiberty/Makefile.bsd-wrapper,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile.bsd-wrapper
--- lib/libiberty/Makefile.bsd-wrapper 10 Jul 2017 21:30:37 -0000 1.18
+++ lib/libiberty/Makefile.bsd-wrapper 13 Sep 2018 15:40:27 -0000
@@ -2,6 +2,7 @@
LIB= iberty
CPPFLAGS+= -DHAVE_CONFIG_H -I$(.CURDIR)/src -I$(.CURDIR)/include
-I$(.OBJDIR)
+XCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" LDFLAGS="${LDFLAGS}"
HOST_FILES!= cat $(.OBJDIR)/needed-list 2>/dev/null||true
@@ -32,12 +33,13 @@ CLEANFILES+= Makefile config.cache confi
BUILDFIRST = needed-list
needed-list: config.status
- ${MAKE} ${GNUCFLAGS} CC="${CC}" needed-list
+ ${MAKE} ${XCFLAGS} needed-list
config.status: Makefile.in configure
PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \
MAKEINFO='makeinfo --no-split' \
+ ${XCFLAGS} \
/bin/sh ${.CURDIR}/src/configure \
--prefix=/usr --with-local-prefix=/usr ${CF} \
&& touch config.status
Index: usr.bin/binutils/Makefile.bsd-wrapper
===================================================================
RCS file: /cvs/src/gnu/usr.bin/binutils/Makefile.bsd-wrapper,v
retrieving revision 1.86
diff -u -p -r1.86 Makefile.bsd-wrapper
--- usr.bin/binutils/Makefile.bsd-wrapper 12 Jun 2017 18:49:34 -0000
1.86
+++ usr.bin/binutils/Makefile.bsd-wrapper 13 Sep 2018 16:48:24 -0000
@@ -3,6 +3,7 @@
.include <bsd.own.mk>
CFLAGS+= ${PIE_DEFAULT}
+XCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" LDFLAGS="${LDSTATIC}"
# This allows moving the whole binutils installation around for
# testing purposes
PREFIX=/usr
@@ -34,8 +35,7 @@ CONFIGTARGET=
all: config.status
SUBDIRS='${SUBDIRS}' \
CONFIGURE_HOST_MODULES='${CONFIGURE_HOST_MODULES}' \
- ${MAKE} CC="${CC}" \
- CFLAGS="${CFLAGS} ${COPTS}" LDFLAGS=${LDSTATIC} \
+ ${MAKE} ${XCFLAGS} \
scriptdir=${PREFIX}/libdata \
tooldir=${PREFIX} \
MAKEINFO='makeinfo --no-split' \
@@ -56,6 +56,7 @@ CF=
do-config: .USE
PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
MAKEINFO='makeinfo --no-split' \
+ ${XCFLAGS} \
sh ${.CURDIR}/configure --prefix=${PREFIX} \
--infodir='$${prefix}/share/info' \
--disable-nls --disable-gdbtk --disable-install-libbfd ${CF} \
@@ -64,6 +65,7 @@ do-config: .USE
sed -e 's,SUBDIRS *=,SUBDIRS ?=,' <Makefile >Makefile.tmp && \
mv -f Makefile.tmp Makefile
cd ${.OBJDIR} && \
+ ${XCFLAGS} \
${MAKE} ${CONFIGURE_MODULES}
config: do-config
Index: usr.bin/binutils-2.17/Makefile.bsd-wrapper
===================================================================
RCS file: /cvs/src/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile.bsd-wrapper
--- usr.bin/binutils-2.17/Makefile.bsd-wrapper 26 Jul 2018 13:20:53 -0000
1.15
+++ usr.bin/binutils-2.17/Makefile.bsd-wrapper 13 Sep 2018 16:48:41 -0000
@@ -8,6 +8,7 @@ SUBDIRS= opcodes bfd
CONF_SUBDIRS= opcodes bfd
CFLAGS+= ${PIE_DEFAULT}
+XCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" LDFLAGS="${LDSTATIC}"
# This allows moving the whole binutils installation around for
# testing purposes
PREFIX=/usr
@@ -64,8 +65,7 @@ CONFIGTARGET+=--without-gnu-as
all: config.status
SUBDIRS='${SUBDIRS}' \
CONFIGURE_HOST_MODULES='${CONFIGURE_HOST_MODULES}' \
- ${MAKE} CC="${CC}" \
- CFLAGS="${CFLAGS} ${COPTS}" LDFLAGS=${LDSTATIC} \
+ ${MAKE} ${XCFLAGS} \
scriptdir=${PREFIX}/libdata \
tooldir=${PREFIX} \
MAKEINFO='makeinfo --no-split' \
@@ -86,6 +86,7 @@ CF=
do-config: .USE
PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
MAKEINFO='makeinfo --no-split' \
+ ${XCFLAGS} \
sh ${.CURDIR}/configure --prefix=${PREFIX} \
--infodir='$${prefix}/share/info' \
--disable-nls --disable-gdbtk --disable-install-libbfd ${CF} \
@@ -94,6 +95,7 @@ do-config: .USE
sed -e 's,SUBDIRS *=,SUBDIRS ?=,' <Makefile >Makefile.tmp && \
mv -f Makefile.tmp Makefile
cd ${.OBJDIR} && \
+ ${XCFLAGS} \
${MAKE} ${CONFIGURE_MODULES}
gas/doc/as.1: config.status
Index: usr.bin/cvs/Makefile.bsd-wrapper
===================================================================
RCS file: /cvs/src/gnu/usr.bin/cvs/Makefile.bsd-wrapper,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile.bsd-wrapper
--- usr.bin/cvs/Makefile.bsd-wrapper 11 Jul 2018 16:38:03 -0000 1.57
+++ usr.bin/cvs/Makefile.bsd-wrapper 13 Sep 2018 16:32:39 -0000
@@ -3,7 +3,7 @@
.include <bsd.own.mk>
MAN= man/cvs.1 man/cvs.5 man/cvsbug.8 man/rcs2log.1
-GNUCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" CPP="${CPP}"
+XCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" CPP="${CPP}"
CLEANFILES= src/version.c lib/getdate.c lib/getdate.h macintosh/Makefile \
os2/Makefile zlib/Makefile \
windows-NT/SCC/Makefile emx/Makefile doc/CVSvn.texi \
@@ -15,7 +15,7 @@ CLEANFILES= src/version.c lib/getdate.c
LDFLAGS=${LDSTATIC}
all: config.status
- ${MAKE} ${GNUCFLAGS} LDFLAGS="${LDFLAGS}" all info
+ ${MAKE} ${XCFLAGS} LDFLAGS="${LDFLAGS}" all info
.FORCE: .IGNORE
@@ -33,6 +33,7 @@ config: .FORCE
INSTALL_DATA="${INSTALL} ${INSTALL_COPY} -o ${DOCOWN} -g ${DOCGRP} -m
${DOCMODE}" \
ACLOCAL=true AUTOCONF=true AUTOMAKE=true AUTOHEADER=true \
MAKEINFO='makeinfo --no-split' \
+ ${XCFLAGS} \
ac_cv_path_ROFF='' \
sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man \
--datadir=/usr/libdata ${CF}
@@ -44,6 +45,7 @@ config.status:
INSTALL_DATA="${INSTALL} ${INSTALL_COPY} -o ${DOCOWN} -g ${DOCGRP} -m
${DOCMODE}" \
ACLOCAL=true AUTOCONF=true AUTOMAKE=true AUTOHEADER=true \
MAKEINFO='makeinfo --no-split' \
+ ${XCFLAGS} \
ac_cv_path_ROFF='' \
sh ${.CURDIR}/configure --prefix=/usr --mandir=/usr/share/man \
--datadir=/usr/libdata ${CF}
@@ -55,7 +57,7 @@ maninstall:
BEFOREMAN=config.status
install: maninstall
- ${MAKE} ${GNUCFLAGS} prefix=${DESTDIR}/usr \
+ ${MAKE} ${XCFLAGS} prefix=${DESTDIR}/usr \
infodir=/usr/share/info \
libexecdir=/usr/libexec \
bindir=/usr/bin INSTALL_MAN= install
--
Christian "naddy" Weisgerber [email protected]
