On 6/22/2017 2:44 PM, O. Hartmann wrote: > Am Thu, 22 Jun 2017 21:22:12 +0000 (UTC) > Bryan Drewery <bdrew...@freebsd.org> schrieb: > >> 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. >> >> The ports binutils stores the version in the 5th word so just look for >> a version using a pattern instead. >> >> 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 >> ============================================================================== >> --- 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!= ${${ld}} --version 2>/dev/null | head -n >> .endif >> .if ${_ld_version:[1..2]} == "GNU ld" >> ${X_}LINKER_TYPE= binutils >> -_v= ${_ld_version:[3]} >> +_v= ${_ld_version:M[1-9].[0-9]*:[1]} >> .elif ${_ld_version:[1]} == "LLD" >> ${X_}LINKER_TYPE= lld >> _v= ${_ld_version:[2]} >> _______________________________________________ >> svn-src-h...@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/svn-src-head >> To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org" > > make installworld: > > > [...] > --- installworld --- > mkdir -p /tmp/install.miEfyZyL > progs=$(for prog in [ awk cap_mkdb cat chflags chmod chown cmp cp date 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=`which $prog`; > then echo > $progpath; else echo "Required tool $prog not found in PATH." >&2; exit 1; > fi; > done); libs=$(ldd -f "%o %p\n" -f "%o %p\n" $progs 2>/dev/null | sort -u | > while read > line; do $line; if [ "$2 $3" != "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=40000 COMPILER_FEATURES=c++11 COMPILER_TYPE=clang > COMPILER_FREEBSD_VERSION=1200006 MAKEOBJDIRPREFIX=/usr/obj MACHINE_ARCH=amd64 > MACHINE=amd64 CPUTYPE=native CC="cc -target x86_64-unknown-freebsd12.0 > --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" CXX="c++ > -target > x86_64-unknown-freebsd12.0 --sysroot=/usr/obj/usr/src/tmp > -B/usr/obj/usr/src/tmp/usr/bin" CPP="cpp -target x86_64-unknown-freebsd12.0 > --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" AS="as" > AR="ar" LD="ld" > LLVM_LINK="" NM=nm OBJCOPY="objcopy" RANLIB=ranlib STRINGS= SIZE="size" > PATH=/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=/tmp/install.miEfyZyL > PATH_LOCALE=/tmp/install.miEfyZyL/locale make -f > Makefile.inc1 __MAKE_SHELL=/tmp/install.miEfyZyL/sh reinstall; > COMPILER_VERSION=40000 COMPILER_FEATURES=c++11 COMPILER_TYPE=clang > COMPILER_FREEBSD_VERSION=1200006 MAKEOBJDIRPREFIX=/usr/obj MACHINE_ARCH=amd64 > MACHINE=amd64 CPUTYPE=native CC="cc -target x86_64-unknown-freebsd12.0 > --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" CXX="c++ > -target > x86_64-unknown-freebsd12.0 --sysroot=/usr/obj/usr/src/tmp > -B/usr/obj/usr/src/tmp/usr/bin" CPP="cpp -target x86_64-unknown-freebsd12.0 > --sysroot=/usr/obj/usr/src/tmp -B/usr/obj/usr/src/tmp/usr/bin" AS="as" > AR="ar" LD="ld" > LLVM_LINK="" NM=nm OBJCOPY="objcopy" RANLIB=ranlib STRINGS= SIZE="size" > PATH=/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=/tmp/install.miEfyZyL > PATH_LOCALE=/tmp/install.miEfyZyL/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=ld *** [installworld] Error > code 1 > >
r320247 should have prevented this. Did you do a full buildworld after SVN up? Which revision are you actually on? -- Regards, Bryan Drewery
signature.asc
Description: OpenPGP digital signature
