]> xenbits.xensource.com Git - people/julieng/freebsd.git/commitdiff
Let makeman run 'make showconfig' without hitting the aarch64 error.
authorbdrewery <bdrewery@FreeBSD.org>
Thu, 17 Sep 2015 04:48:15 +0000 (04:48 +0000)
committerbdrewery <bdrewery@FreeBSD.org>
Thu, 17 Sep 2015 04:48:15 +0000 (04:48 +0000)
Makefile.inc1

index f88c547be71bdd82d8aab7df7b9f5431d623b662..26f81cd4415816156f6c3f1f41db8e03decf498d 100644 (file)
@@ -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}