Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Jul 2018 15:10:06 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r336910 - head/share/mk
Message-ID:  <201807301510.w6UFA6bB099933@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Mon Jul 30 15:10:06 2018
New Revision: 336910
URL: https://svnweb.freebsd.org/changeset/base/336910

Log:
  Revert accidental change from r336908
  
  By default ld.lld should be the bootstrap linker (only) on i386 right
  now.  Once the i386 exp-run with LLD_IS_LD has a good result this will
  also be enabled by default.
  
  Reported by:	andrew
  Pointy hat to:	emaste

Modified:
  head/share/mk/src.opts.mk

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Mon Jul 30 15:05:07 2018	(r336909)
+++ head/share/mk/src.opts.mk	Mon Jul 30 15:10:06 2018	(r336910)
@@ -309,8 +309,11 @@ __DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND
 .else
 __DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
 .endif
-.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386"
+.if ${__T} == "aarch64" || ${__T} == "amd64"
 __DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
+.elif ${__T} == "i386"
+__DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP
+__DEFAULT_NO_OPTIONS+=LLD_IS_LD
 .else
 __DEFAULT_NO_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
 .endif



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