Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Apr 2017 16:12:23 +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: r317608 - head/share/mk
Message-ID:  <201704301612.v3UGCNLl048027@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Sun Apr 30 16:12:23 2017
New Revision: 317608
URL: https://svnweb.freebsd.org/changeset/base/317608

Log:
  revert r313473 (Disable LLD_IS_LD option combinations that fail)
  
  r316647 corrected the build of tblgen and libllvm as dependencies for
  LLD so undo the temporary seat-belt.
  
  We still want to extend the build infrastructure to automatically detect
  the case where the host LLD can be used instead of building a bootstrap
  LLD, and likely extend libllvmminimal to meet LLD's needs for cases
  where the build includes LLD but not Clang.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Sun Apr 30 13:25:10 2017	(r317607)
+++ head/share/mk/src.opts.mk	Sun Apr 30 16:12:23 2017	(r317608)
@@ -339,16 +339,6 @@ MK_LDNS_UTILS:=	no
 MK_UNBOUND:= no
 .endif
 
-.if ${MK_LLD} == "no"
-MK_LLD_IS_LD:=	no
-.endif
-
-# LLD requires LLVM libraries, and we do not yet compare in-tree and host LLD
-# versions to avoid building it if they are identical.
-.if ${MK_LLD_IS_LD} != "no"
-MK_SYSTEM_COMPILER:=	no
-.endif
-
 .if ${MK_SOURCELESS} == "no"
 MK_SOURCELESS_HOST:=	no
 MK_SOURCELESS_UCODE:= no



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