Date: Thu, 22 Jun 2017 15:53:31 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: "O. Hartmann" <ohartmann@walstatt.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r320248 - head/share/mk Message-ID: <40da943b-4d4e-125d-d4ce-9cf0d9d4f77c@FreeBSD.org> In-Reply-To: <20170622234430.2ab00612@thor.intern.walstatt.dynvpn.de> References: <201706222122.v5MLMCCv033936@repo.freebsd.org> <20170622234430.2ab00612@thor.intern.walstatt.dynvpn.de>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --3Ao5hwVMFDNSifIPWtMQvoK7NH0bkxf2v Content-Type: multipart/mixed; boundary="Cu0WeJOPpS10p9W4DNXTRnkMUUOe5REbC"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: "O. Hartmann" <ohartmann@walstatt.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <40da943b-4d4e-125d-d4ce-9cf0d9d4f77c@FreeBSD.org> Subject: Re: svn commit: r320248 - head/share/mk References: <201706222122.v5MLMCCv033936@repo.freebsd.org> <20170622234430.2ab00612@thor.intern.walstatt.dynvpn.de> In-Reply-To: <20170622234430.2ab00612@thor.intern.walstatt.dynvpn.de> --Cu0WeJOPpS10p9W4DNXTRnkMUUOe5REbC Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 6/22/2017 2:44 PM, O. Hartmann wrote: > Am Thu, 22 Jun 2017 21:22:12 +0000 (UTC) > Bryan Drewery <bdrewery@FreeBSD.org> schrieb: >=20 >> Author: bdrewery >> Date: Thu Jun 22 21:22:12 2017 >> New Revision: 320248 >> URL: https://svnweb.freebsd.org/changeset/base/320248 >> >> Log: >> LINKER_VERSION: Support external binutils. >> =20 >> The ports binutils stores the version in the 5th word so just look f= or >> a version using a pattern instead. >> =20 >> Reported by: rpokala >> MFC after: 2 weeks >> Sponsored by: Dell EMC Isilon >> >> Modified: >> head/share/mk/bsd.linker.mk >> >> Modified: head/share/mk/bsd.linker.mk >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/share/mk/bsd.linker.mk Thu Jun 22 21:03:30 2017 (r320247) >> +++ head/share/mk/bsd.linker.mk Thu Jun 22 21:22:12 2017 (r320248) >> @@ -48,7 +48,7 @@ _ld_version!=3D ${${ld}} --version 2>/dev/null | hea= d -n >> .endif >> .if ${_ld_version:[1..2]} =3D=3D "GNU ld" >> ${X_}LINKER_TYPE=3D binutils >> -_v=3D ${_ld_version:[3]} >> +_v=3D ${_ld_version:M[1-9].[0-9]*:[1]} >> .elif ${_ld_version:[1]} =3D=3D "LLD" >> ${X_}LINKER_TYPE=3D lld >> _v=3D ${_ld_version:[2]} >> _______________________________________________ >> svn-src-head@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/svn-src-head >> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org= " >=20 > make installworld: >=20 >=20 > [...] > --- installworld --- > mkdir -p /tmp/install.miEfyZyL > progs=3D$(for prog in [ awk cap_mkdb cat chflags chmod chown cmp cp da= te echo egrep find > grep id install ln make mkdir mtree mv pwd_mkdb rm sed services_mkdb= sh strip sysctl > test true uname wc zic tzsetup makewhatis; do if progpath=3D`which $= prog`; then echo > $progpath; else echo "Required tool $prog not found in PATH." >&2; e= xit 1; fi; > done); libs=3D$(ldd -f "%o %p\n" -f "%o %p\n" $progs 2>/dev/null | sor= t -u | while read > line; do $line; if [ "$2 $3" !=3D "not found" ]; then echo $2; else= echo "Required > library $1 not found." >&2; exit 1; fi; done); cp $libs $progs /tmp= /install.miEfyZyL > cp -R ${PATH_LOCALE:-"/usr/share/locale"} /tmp/install.miEfyZyL/locale = cd /usr/src; > COMPILER_VERSION=3D40000 COMPILER_FEATURES=3Dc++11 COMPILER_TYPE=3Dcl= ang > COMPILER_FREEBSD_VERSION=3D1200006 MAKEOBJDIRPREFIX=3D/usr/obj MACHINE= _ARCH=3Damd64 > MACHINE=3Damd64 CPUTYPE=3Dnative CC=3D"cc -target x86_64-unknown-freeb= sd12.0 > --sysroot=3D/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" CXX=3D= "c++ -target > x86_64-unknown-freebsd12.0 --sysroot=3D/usr/obj/usr/src/tmp > -B/usr/obj/usr/src/tmp/usr/bin" CPP=3D"cpp -target x86_64-unknown-free= bsd12.0 > --sysroot=3D/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" AS=3D= "as" AR=3D"ar" LD=3D"ld" > LLVM_LINK=3D"" NM=3Dnm OBJCOPY=3D"objcopy" RANLIB=3Dranlib STRINGS=3D= SIZE=3D"size" > PATH=3D/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy= /usr/bin:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/u= sr/obj/usr/src/tmp/usr/bin:/tmp/install.miEfyZyL > LD_LIBRARY_PATH=3D/tmp/install.miEfyZyL PATH_LOCALE=3D/tmp/install.miE= fyZyL/locale make -f > Makefile.inc1 __MAKE_SHELL=3D/tmp/install.miEfyZyL/sh reinstall; > COMPILER_VERSION=3D40000 COMPILER_FEATURES=3Dc++11 COMPILER_TYPE=3Dcl= ang > COMPILER_FREEBSD_VERSION=3D1200006 MAKEOBJDIRPREFIX=3D/usr/obj MACHINE= _ARCH=3Damd64 > MACHINE=3Damd64 CPUTYPE=3Dnative CC=3D"cc -target x86_64-unknown-freeb= sd12.0 > --sysroot=3D/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" CXX=3D= "c++ -target > x86_64-unknown-freebsd12.0 --sysroot=3D/usr/obj/usr/src/tmp > -B/usr/obj/usr/src/tmp/usr/bin" CPP=3D"cpp -target x86_64-unknown-free= bsd12.0 > --sysroot=3D/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" AS=3D= "as" AR=3D"ar" LD=3D"ld" > LLVM_LINK=3D"" NM=3Dnm OBJCOPY=3D"objcopy" RANLIB=3Dranlib STRINGS=3D= SIZE=3D"size" > PATH=3D/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy= /usr/bin:/usr/obj/usr/src/tmp/legacy/bin:/usr/obj/usr/src/tmp/usr/sbin:/u= sr/obj/usr/src/tmp/usr/bin:/tmp/install.miEfyZyL > LD_LIBRARY_PATH=3D/tmp/install.miEfyZyL PATH_LOCALE=3D/tmp/install.miE= fyZyL/locale rm > -rf /tmp/install.miEfyZyL sh: head: not found make[2]: "/usr/src/share/= mk/bsd.linker.mk" > line 41: Unable to determine linker type from LD=3Dld *** [installworld= ] Error code 1 >=20 >=20 r320249 fixes it. No need to do another buildworld. --=20 Regards, Bryan Drewery --Cu0WeJOPpS10p9W4DNXTRnkMUUOe5REbC-- --3Ao5hwVMFDNSifIPWtMQvoK7NH0bkxf2v Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJZTEpsAAoJEDXXcbtuRpfPBaIH/0QP12jIch6tIfUbwUHpaIjm FOet3nhOGKL6ojZrcdmfdppuAmoKioE+nhAV11MyCZHd3RXpLF8llU5qcXGC81Z6 ORfQfMgq2wofOK1CW7OkMDE1RO/K9GWIQyeFs8KwVLeIcNlLug0CmqrHqhuQl2Pk V3grXwOAwndW7TyRX7lPj2L+LfzI9YtlBS+Lwd85ZhM3LwCJezF4T40ppMxMIGja nkZgEKQ90CnRY+irOsa90zXOKLS1Osn1DrKlec3sMS2zGCFatV91VUEzdXk8mw/Q XLn9FCgF05PJdY8Fgk2gI5qQq4y1ugc8KmOCGzVCRm0tzuioYr2vcB9G0YPa6/g= =6of7 -----END PGP SIGNATURE----- --3Ao5hwVMFDNSifIPWtMQvoK7NH0bkxf2v--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?40da943b-4d4e-125d-d4ce-9cf0d9d4f77c>