Date: Thu, 22 Jun 2017 23:44:30 +0200 From: "O. Hartmann" <ohartmann@walstatt.org> To: Bryan Drewery <bdrewery@FreeBSD.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: <20170622234430.2ab00612@thor.intern.walstatt.dynvpn.de> In-Reply-To: <201706222122.v5MLMCCv033936@repo.freebsd.org> References: <201706222122.v5MLMCCv033936@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Sig_/VYtqTxJV9u1_mQetu6X5kTA Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am Thu, 22 Jun 2017 21:22:12 +0000 (UTC) Bryan Drewery <bdrewery@FreeBSD.org> schrieb: > Author: bdrewery > Date: Thu Jun 22 21:22:12 2017 > New Revision: 320248 > URL: https://svnweb.freebsd.org/changeset/base/320248 >=20 > Log: > LINKER_VERSION: Support external binutils. > =20 > The ports binutils stores the version in the 5th word so just look for > a version using a pattern instead. > =20 > Reported by: rpokala > MFC after: 2 weeks > Sponsored by: Dell EMC Isilon >=20 > Modified: > head/share/mk/bsd.linker.mk >=20 > 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 | head -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" make installworld: [...] --- installworld --- mkdir -p /tmp/install.miEfyZyL progs=3D$(for prog in [ awk cap_mkdb cat chflags chmod chown cmp cp date e= cho 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; exit = 1; fi; done); libs=3D$(ldd -f "%o %p\n" -f "%o %p\n" $progs 2>/dev/null | sort -u= | while read line; do $line; if [ "$2 $3" !=3D "not found" ]; then echo $2; else ec= ho "Required library $1 not found." >&2; exit 1; fi; done); cp $libs $progs /tmp/ins= tall.miEfyZyL cp -R ${PATH_LOCALE:-"/usr/share/locale"} /tmp/install.miEfyZyL/locale cd /= usr/src; COMPILER_VERSION=3D40000 COMPILER_FEATURES=3Dc++11 COMPILER_TYPE=3Dclang COMPILER_FREEBSD_VERSION=3D1200006 MAKEOBJDIRPREFIX=3D/usr/obj MACHINE_ARC= H=3Damd64 MACHINE=3Damd64 CPUTYPE=3Dnative CC=3D"cc -target x86_64-unknown-freebsd12= .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-freebsd1= 2.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 SI= ZE=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:/usr/obj= /usr/src/tmp/usr/bin:/tmp/install.miEfyZyL LD_LIBRARY_PATH=3D/tmp/install.miEfyZyL PATH_LOCALE=3D/tmp/install.miEfyZy= L/locale make -f Makefile.inc1 __MAKE_SHELL=3D/tmp/install.miEfyZyL/sh reinstall; COMPILER_VERSION=3D40000 COMPILER_FEATURES=3Dc++11 COMPILER_TYPE=3Dclang COMPILER_FREEBSD_VERSION=3D1200006 MAKEOBJDIRPREFIX=3D/usr/obj MACHINE_ARC= H=3Damd64 MACHINE=3Damd64 CPUTYPE=3Dnative CC=3D"cc -target x86_64-unknown-freebsd12= .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-freebsd1= 2.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 SI= ZE=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:/usr/obj= /usr/src/tmp/usr/bin:/tmp/install.miEfyZyL LD_LIBRARY_PATH=3D/tmp/install.miEfyZyL PATH_LOCALE=3D/tmp/install.miEfyZy= L/locale rm -rf /tmp/install.miEfyZyL sh: head: not found make[2]: "/usr/src/share/mk/b= sd.linker.mk" line 41: Unable to determine linker type from LD=3Dld *** [installworld] Er= ror code 1 --=20 O. Hartmann Ich widerspreche der Nutzung oder =C3=9Cbermittlung meiner Daten f=C3=BCr Werbezwecke oder f=C3=BCr die Markt- oder Meinungsforschung (=C2=A7 28 Abs.= 4 BDSG). --Sig_/VYtqTxJV9u1_mQetu6X5kTA Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCWUw6PgAKCRDS528fyFhY lNhgAgCJbnnnvR/lsalyQ1oHYhQDY66BI0oT35KdKOkmHUUOcMEhV/W0NptZrujs 2UKOu1DCjjVOvyO/coQaeq1PHP5XAf9HihqRPPkPHvjtlil93LDWp+05QnMgyWWH qOzAdfsw7EODC1U5wDR5ecmUeqpTRgSp571uUPpnMSFac1d5/1xu =fdJj -----END PGP SIGNATURE----- --Sig_/VYtqTxJV9u1_mQetu6X5kTA--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170622234430.2ab00612>