From 2da35800ba74197e3c32cfb7335da62b036ad920 Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Thu, 9 Apr 2015 06:38:32 +0000
Subject: MFC r280980:

Ensure the cross assembler, linker and objcopy are used for the build32
stage, just like for the regular world stage.

Reviewed by:	rodrigc, imp, bapt, emaste
Differential Revision: https://reviews.freebsd.org/D2187
---
 Makefile.inc1 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'Makefile.inc1')

diff --git a/Makefile.inc1 b/Makefile.inc1
index 48a6cfd..63a10cb 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -375,8 +375,9 @@ LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
 LIB32WMAKEENV=	MACHINE=i386 MACHINE_ARCH=i386 \
 		MACHINE_CPU="i686 mmx sse sse2"
 LIB32WMAKEFLAGS=	\
-		AS="${AS} --32" \
-		LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32"
+		AS="${XAS} --32" \
+		LD="${XLD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
+		OBJCOPY="${XOBJCOPY}"
 
 .elif ${TARGET_ARCH} == "powerpc64"
 .if empty(TARGET_CPUTYPE)
@@ -386,7 +387,8 @@ LIB32CPUFLAGS=	-mcpu=${TARGET_CPUTYPE}
 .endif
 LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc
 LIB32WMAKEFLAGS=	\
-		LD="${LD} -m elf32ppc_fbsd"
+		LD="${XLD} -m elf32ppc_fbsd" \
+		OBJCOPY="${XOBJCOPY}"
 .endif
 
 
-- 
cgit v1.1