diff --git a/Makefile.inc1 b/Makefile.inc1 index 9c6ca7cbc88..92e01389b4c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -224,7 +224,7 @@ MK_SYSTEM_LINKER= no .if defined(CROSS_TOOLCHAIN_PREFIX) CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} .endif -XBINUTILS= AS AR ELFCTL LD NM OBJCOPY RANLIB SIZE STRINGS STRIPBIN +XBINUTILS= AR ELFCTL LD NM OBJCOPY SIZE STRINGS STRIPBIN .for BINUTIL in ${XBINUTILS} .if defined(CROSS_BINUTILS_PREFIX) && \ exists(${CROSS_BINUTILS_PREFIX}/${${BINUTIL}}) @@ -240,8 +240,8 @@ MK_LLD_BOOTSTRAP= no .endif # If full paths to all standard bintuils are given, don't build LLVM binutils. -.if ${XAR:M/*} && ${XNM:M/*} && ${XOBJCOPY:M/*} && ${XRANLIB:M/*} && \ - ${XSIZE:M/*} && ${XSTRINGS:M/*} && ${XSTRIPBIN:M/*} +.if ${XAR:M/*} && ${XNM:M/*} && ${XOBJCOPY:M/*} && ${XSIZE:M/*} && \ + ${XSTRINGS:M/*} && ${XSTRIPBIN:M/*} MK_LLVM_BINUTILS_BOOTSTRAP= no .endif @@ -855,9 +855,9 @@ HMAKE+= PATH=${TMPPATH:Q} METALOG=${METALOG} -DNO_ROOT CROSSENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCXXFLAGS} ${XCFLAGS}" \ CPP="${XCPP} ${XCFLAGS}" \ - AS="${XAS}" AR="${XAR}" ELFCTL="${XELFCTL}" LD="${XLD}" \ + AR="${XAR}" ELFCTL="${XELFCTL}" LD="${XLD}" \ LLVM_LINK="${XLLVM_LINK}" NM=${XNM} OBJCOPY="${XOBJCOPY}" \ - RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \ + STRINGS=${XSTRINGS} \ SIZE="${XSIZE}" STRIPBIN="${XSTRIPBIN}" .if defined(CROSS_BINUTILS_PREFIX) && exists(${CROSS_BINUTILS_PREFIX}) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 33ce061a111..c277647a925 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1013,7 +1013,6 @@ To be able to build the system alternate binary utilities must be provided via .Ev XAR , .Ev XNM , .Ev XOBJCOPY , -.Ev XRANLIB , .Ev XSIZE , .Ev XSTRINGS , and diff --git a/tools/build/options/WITHOUT_LLVM_BINUTILS_BOOTSTRAP b/tools/build/options/WITHOUT_LLVM_BINUTILS_BOOTSTRAP index 141679d4f6a..b30e8135d28 100644 --- a/tools/build/options/WITHOUT_LLVM_BINUTILS_BOOTSTRAP +++ b/tools/build/options/WITHOUT_LLVM_BINUTILS_BOOTSTRAP @@ -4,7 +4,6 @@ To be able to build the system alternate binary utilities must be provided via .Ev XAR , .Ev XNM , .Ev XOBJCOPY , -.Ev XRANLIB , .Ev XSIZE , .Ev XSTRINGS , and