From c9bb38b87405c96fe6237e2de1fabf25ad5eedb8 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sun, 28 Jul 2013 16:58:31 +0000 Subject: [PATCH] PACKAGE_BUILDING isn't really the right condition here; what we use as the binutils really depends on whether this is being used as a master port or as a standalone port. --- devel/cross-gcc/Makefile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/devel/cross-gcc/Makefile b/devel/cross-gcc/Makefile index f18cdf7cdd1e..dc9200a14d1f 100644 --- a/devel/cross-gcc/Makefile +++ b/devel/cross-gcc/Makefile @@ -22,18 +22,10 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \ mpfr.4:${PORTSDIR}/math/mpfr \ mpc.2:${PORTSDIR}/math/mpc -# -# Temporary hack to deal with dependencies during package builds for -# slave ports. -# -.if defined(PACKAGE_BUILDING) -BUILD_DEPENDS= ${OURTARGET}-as:${PORTSDIR}/devel/${OURTARGET}-binutils -RUN_DEPENDS= ${OURTARGET}-as:${PORTSDIR}/devel/${OURTARGET}-binutils -BROKEN= plist build broken with tinderbox/cluster -.else -BUILD_DEPENDS= ${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils -RUN_DEPENDS= ${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils -.endif +# If using this as a master port, override BUILD_DEPENDS and +# RUN_DEPENDS with the appropriate specific binutils port. +BUILD_DEPENDS?= ${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils +RUN_DEPENDS?= ${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils USE_BZIP2= yes USE_GMAKE= yes