diff options
| author | dim <dim@FreeBSD.org> | 2015-04-09 06:38:32 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-04-09 06:38:32 +0000 |
| commit | 2da35800ba74197e3c32cfb7335da62b036ad920 (patch) | |
| tree | 68f89963760e6dd4e7158a835f278ded8c8696aa /Makefile.inc1 | |
| parent | 0aa481cad3a84b410a9897e52b36dfb14d91936c (diff) | |
| download | FreeBSD-src-2da35800ba74197e3c32cfb7335da62b036ad920.zip FreeBSD-src-2da35800ba74197e3c32cfb7335da62b036ad920.tar.gz | |
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
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 5 insertions, 3 deletions
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 |
