From: bdrewery <bdrewery@FreeBSD.org>
Date: Thu, 17 Sep 2015 04:48:15 +0000 (+0000)
Subject: Let makeman run 'make showconfig' without hitting the aarch64 error.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0981656a6da4b80b1999104c28e5306df41d5b03;p=people%2Fjulieng%2Ffreebsd.git

Let makeman run 'make showconfig' without hitting the aarch64 error.
---

diff --git a/Makefile.inc1 b/Makefile.inc1
index f88c547be71b..26f81cd44158 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -330,6 +330,7 @@ CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
 # support the target architecture), provide a default cross-binutils prefix.
 # This allows aarch64 builds, for example, to automatically use the
 # aarch64-binutils port or package.
+.if !make(showconfig)
 .if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \
     !defined(CROSS_BINUTILS_PREFIX)
 CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_ARCH}-freebsd/bin/
@@ -337,6 +338,7 @@ CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_ARCH}-freebsd/bin/
 .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
 
 XCOMPILERS=	CC CXX CPP
 .for COMPILER in ${XCOMPILERS}