Tue Oct 11 03:57:00 2016 UTC ()
pass -L in LDFLAGS.  clang complains about it to stderr, and configure
checks for headers fail if there are unexpected stderr.


(mrg)
diff -r1.25 -r1.26 src/tools/binutils/Makefile
cvs diff -r1.25 -r1.26 src/tools/binutils/Makefile (expand / switch to unified diff)

--- src/tools/binutils/Makefile 2016/01/26 17:47:57 1.25
+++ src/tools/binutils/Makefile 2016/10/11 03:57:00 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.25 2016/01/26 17:47:57 christos Exp $ 1# $NetBSD: Makefile,v 1.26 2016/10/11 03:57:00 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5MODULE= binutils 5MODULE= binutils
6 6
7GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_BINUTILS_SUBDIR}/dist 7GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_BINUTILS_SUBDIR}/dist
8 8
9BRANDING?= \ 9BRANDING?= \
10 --with-pkgversion="NetBSD Binutils nb1" \ 10 --with-pkgversion="NetBSD Binutils nb1" \
11 --with-bugurl="http://www.NetBSD.org/support/send-pr.html" \ 11 --with-bugurl="http://www.NetBSD.org/support/send-pr.html" \
12 --with-lib-path="=/usr/lib" --with-sysroot 12 --with-lib-path="=/usr/lib" --with-sysroot
13 13
14CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} --disable-nls \ 14CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} --disable-nls \
@@ -24,48 +24,50 @@ build/gas/m68k-parse.c: ${GNUHOSTDIST}/g @@ -24,48 +24,50 @@ build/gas/m68k-parse.c: ${GNUHOSTDIST}/g
24.configure_done: build/gas/m68k-parse.c 24.configure_done: build/gas/m68k-parse.c
25 25
26MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} 26MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q}
27 27
28ALL_TARGET= all-binutils all-gas all-ld 28ALL_TARGET= all-binutils all-gas all-ld
29INSTALL_TARGET= install-binutils install-gas install-ld 29INSTALL_TARGET= install-binutils install-gas install-ld
30.if ${MKCROSSGPROF:Uno} != "no" 30.if ${MKCROSSGPROF:Uno} != "no"
31ALL_TARGET+= all-gprof 31ALL_TARGET+= all-gprof
32INSTALL_TARGET+=install-gprof 32INSTALL_TARGET+=install-gprof
33.endif 33.endif
34 34
35.include "${.CURDIR}/../Makefile.gnuhost" 35.include "${.CURDIR}/../Makefile.gnuhost"
36 36
37CCADDFLAGS= -I${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ 37CCADDFLAGS= -I${DESTDIR}/usr/include -B${DESTDIR}/usr/lib/
 38LDADDFLAGS= -L${DESTDIR}/lib -L${DESTDIR}/usr/lib
38 39
39# Force avoiding possibly non-executable install-sh. 40# Force avoiding possibly non-executable install-sh.
40CONFIGURE_ENV+= ac_cv_path_mkdir="${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install -d" 41CONFIGURE_ENV+= ac_cv_path_mkdir="${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install -d"
41 42
42NEWCONFIGDIR?= ${.CURDIR}/../.. 43NEWCONFIGDIR?= ${.CURDIR}/../..
43MKNATIVE?= ${.CURDIR}/mknative-binutils 44MKNATIVE?= ${.CURDIR}/mknative-binutils
44 45
45native-binutils: .native/.configure_done 46native-binutils: .native/.configure_done
46 @echo 'Extracting GNU binutils configury for a native toolchain.' 47 @echo 'Extracting GNU binutils configury for a native toolchain.'
47 MAKE=${MAKE:Q} ${HOST_SH} ${MKNATIVE} binutils \ 48 MAKE=${MAKE:Q} ${HOST_SH} ${MKNATIVE} binutils \
48 ${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} 49 ${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM}
49 50
50.native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile 51.native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile
51 mkdir .native 2>/dev/null || true 52 mkdir .native 2>/dev/null || true
52 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \ 53 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
53 (cd .native && ${CONFIGURE_ENV:NC*:NLD*} \ 54 (cd .native && ${CONFIGURE_ENV:NC*:NLD*} \
54 CC_FOR_BUILD=${HOST_CC:Q} \ 55 CC_FOR_BUILD=${HOST_CC:Q} \
55 CC=${CC:Q}' '${CCADDFLAGS:Q} \ 56 CC=${CC:Q}' '${CCADDFLAGS:Q} \
56 CXX=${CXX:Q}' '${CCADDFLAGS:Q} \ 57 CXX=${CXX:Q}' '${CCADDFLAGS:Q} \
57 CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \ 58 CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
58 CFLAGS= CPPFLAGS= CXXFLAGS= LDFLAGS= \ 59 CFLAGS= CPPFLAGS= CXXFLAGS= \
 60 LDFLAGS=${LDADDFLAGS:Q} \
59 MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \ 61 MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \
60 XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \ 62 XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \
61 LIBS=-lintl \ 63 LIBS=-lintl \
62 ac_cv_prog_cc_cross=yes \ 64 ac_cv_prog_cc_cross=yes \
63 ac_cv_func_strcoll_works=yes \ 65 ac_cv_func_strcoll_works=yes \
64 ${HOST_SH} ${GNUHOSTDIST}/configure \ 66 ${HOST_SH} ${GNUHOSTDIST}/configure \
65 --build=`${GNUHOSTDIST}/config.guess` \ 67 --build=`${GNUHOSTDIST}/config.guess` \
66 --host=${MACHINE_GNU_PLATFORM} \ 68 --host=${MACHINE_GNU_PLATFORM} \
67 --target=${MACHINE_GNU_PLATFORM} \ 69 --target=${MACHINE_GNU_PLATFORM} \
68 ${BRANDING} \ 70 ${BRANDING} \
69 ) 71 )
70 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \ 72 PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
71 (cd .native && ${MAKE} configure-host) 73 (cd .native && ${MAKE} configure-host)