Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Jun 2018 16:16:22 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r334791 - head/share/mk
Message-ID:  <201806071616.w57GGMIo017645@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Thu Jun  7 16:16:22 2018
New Revision: 334791
URL: https://svnweb.freebsd.org/changeset/base/334791

Log:
  Stop using head(1) which is not available in installworld.
  
  installworld should not be executing this anyhow but there is some
  obscure case doing it still.  The head(1) binary is not part of
  ITOOLS and there's no need to add it.
  
  MFC after:	1 week
  Sponsored by:	Dell EMC

Modified:
  head/share/mk/bsd.linker.mk

Modified: head/share/mk/bsd.linker.mk
==============================================================================
--- head/share/mk/bsd.linker.mk	Thu Jun  7 15:59:08 2018	(r334790)
+++ head/share/mk/bsd.linker.mk	Thu Jun  7 16:16:22 2018	(r334791)
@@ -49,7 +49,7 @@ ${var}=	${${var}.${${X_}_ld_hash}}
 
 .if ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD})
 .if !defined(${X_}LINKER_TYPE) || !defined(${X_}LINKER_VERSION)
-_ld_version!=	(${${ld}} --version || echo none) | head -n 1
+_ld_version!=	(${${ld}} --version || echo none) | sed -n '1,1p'
 .if ${_ld_version} == "none"
 .warning Unable to determine linker type from ${ld}=${${ld}}
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806071616.w57GGMIo017645>