From 0756733f67cbef259d331df31f25253f03ab873f Mon Sep 17 00:00:00 2001
From: John Marino <draco@marino.st>
Date: Fri, 24 Feb 2012 18:50:25 +0100
Subject: [PATCH] build: Add WORLD_LDVER (similar to WORLD_CCVER)

This enables building world and kernel with the gold linker, and the
result is finally fully bootable and functional.
---
 Makefile.inc1 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index dea0edf543..244a0784be 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -118,8 +118,9 @@ DESTDIRBASE?=		${OBJTREE}${.CURDIR}
 # anyhow, and we need to be able to override it for stage installs
 .MAKEFLAGS:=	${.MAKEFLAGS:NDESTDIR=*}
 
-# This sets the compiler we use to build the world/kernel with
-WORLD_CCVER?=	gcc44
+# This section sets the tools used to build the world/kernel
+WORLD_CCVER?=		gcc44
+WORLD_LDVER?=		ld.bfd
 WORLD_BINUTILSVER?=	binutils222
 
 # temporary until everybody has converted to x86_64
@@ -287,6 +288,7 @@ CROSSENV=	MAKEOBJDIRPREFIX=${WORLDDEST} \
 		OBJFORMAT_PATH=${CTOOLSDEST} \
 		HOST_CCVER=${HOST_CCVER} \
 		CCVER=${WORLD_CCVER} \
+		LDVER=${WORLD_LDVER} \
 		BINUTILSVER=${WORLD_BINUTILSVER}
 
 WMAKEENV=	${CROSSENV} \
-- 
2.41.0