From 7ec5e1c4cd74b66192e5a34c082dc580e587f77b Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 22 Jan 2020 21:21:24 +0000 Subject: [PATCH] Remove support for auto-selecting an external binutils. All of the in-tree architectures not supported by in-tree binutils are supported by lld, so the condition is now always false. It also didn't fully work since the external binutils are installed into a directory that uses the host's OS version, not the target OS version. Reviewed by: emaste, imp Differential Revision: https://reviews.freebsd.org/D23294 --- Makefile.inc1 | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index c7346cc8d580..b35a9db01739 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -180,24 +180,6 @@ MK_SYSTEM_LINKER= no .if defined(CROSS_TOOLCHAIN_PREFIX) CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} .endif -# If we do not have a bootstrap binutils (because the in-tree one does not -# support the target architecture), provide a default cross-binutils prefix. -# This allows riscv64 builds, for example, to automatically use the -# riscv64-binutils port or package. -.if !make(showconfig) && !defined(_NO_INCLUDE_COMPILERMK) -.if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \ - ${MK_LLD_BOOTSTRAP} == "no" && \ - !defined(CROSS_BINUTILS_PREFIX) -CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_TRIPLE}/bin/ -.if !exists(${CROSS_BINUTILS_PREFIX}) -.if !empty(BROKEN_OPTIONS:MGCC_BOOTSTRAP) && ${MK_CLANG_BOOTSTRAP} == "no" -.error In-tree toolchain does not support the ${TARGET_ARCH} architecture. Install the ${TARGET_ARCH}-xtoolchain-gcc port or package or set CROSS_TOOLCHAIN_PREFIX. -.else -.error In-tree binutils does not support the ${TARGET_ARCH} architecture. Install the ${TARGET_ARCH}-binutils port or package or set CROSS_BINUTILS_PREFIX. -.endif -.endif -.endif -.endif XBINUTILS= AS AR LD NM OBJCOPY RANLIB SIZE STRINGS .for BINUTIL in ${XBINUTILS} .if defined(CROSS_BINUTILS_PREFIX) && \