commit 75733b1
Author: Jan Beich <jbeich@FreeBSD.org>
Date:   Tue Jul 12 07:28:51 2016 +0000

    sysutils/uefi-edk2-bhyve: allow compiling with other lang/gcc* versions
---
 sysutils/uefi-edk2-bhyve/Makefile | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git sysutils/uefi-edk2-bhyve/Makefile sysutils/uefi-edk2-bhyve/Makefile
index a679c7d..c0f64c8 100644
--- sysutils/uefi-edk2-bhyve/Makefile
+++ sysutils/uefi-edk2-bhyve/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	bash:shells/bash \
 
 USES=		gmake \
 		python:build
-USE_GCC=	4.8
+USE_GCC=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	uefi-edk2
@@ -31,12 +31,12 @@ OPTIONS_DEFINE=	DEBUG
 DEBUG_VARS=	uefi_target=DEBUG
 DEBUG_VARS_OFF=	uefi_target=RELEASE
 
-MAKE_ARGS+=	AS=${LOCALBASE}/bin/as \
-		AR=${LOCALBASE}/bin/ar \
-		LD=${LOCALBASE}/bin/ld \
-		OBJCOPY=${LOCALBASE}/bin/objcopy \
-		CC=${LOCALBASE}/bin/gcc48 \
-		CXX=${LOCALBASE}/bin/g++48
+MAKE_ARGS+=	AS="${AS}" \
+		AR="${AR}" \
+		LD="${LD}" \
+		OBJCOPY="${OBJCOPY}" \
+		CC="${CC}" \
+		CXX="${CXX}"
 
 BUILD_ARGS=-DDEBUG_ON_SERIAL_PORT=TRUE -D FD_SIZE_2MB
 
@@ -54,12 +54,9 @@ post-extract:
 do-build:
 	unset ARCH; unset MAKEFLAGS; ${MAKE_CMD} ${MAKE_ARGS} -C ${BUILD_WRKSRC}/BaseTools
 	${MKDIR} ${BUILD_WRKSRC}/Build;
-	${LN} -sf ${LOCALBASE}/bin/gcc48 ${BUILD_WRKSRC}/Build/gcc
-	${LN} -sf ${LOCALBASE}/bin/ld ${BUILD_WRKSRC}/Build/ld
-	${LN} -sf ${LOCALBASE}/bin/gmake ${BUILD_WRKSRC}/Build/make
-	${LN} -sf ${LOCALBASE}/bin/ar ${BUILD_WRKSRC}/Build/ar
-	${LN} -sf ${LOCALBASE}/bin/objcopy ${BUILD_WRKSRC}/Build/objcopy
-	${LN} -sf ${LOCALBASE}/bin/nasm ${BUILD_WRKSRC}/Build/nasm
+	@for f in ${CC}:gcc ${LD}:ld ${GMAKE}:make ${AR}:ar ${OBJCOPY}:objcopy nasm; do \
+		${LN} -vsf $$(command -v $${f%:*}) ${BUILD_WRKSRC}/Build/$${f##*:}; \
+	done
 .if defined(WITH_CSM)
 	bash -c " \
 		cd ${BUILD_WRKSRC}; \