Index: branches/2020Q2/benchmarks/libcelero/Makefile
===================================================================
--- branches/2020Q2/benchmarks/libcelero/Makefile	(revision 532697)
+++ branches/2020Q2/benchmarks/libcelero/Makefile	(revision 532698)
@@ -1,30 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=	libcelero
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.0
 PORTREVISION=	1
 CATEGORIES=	benchmarks
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ benchmark authoring library/framework
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo
 
-USES=		cmake localbase:ldflags # compiler:c++11-lang
+USES=		cmake compiler localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	DigitalInBlue
 GH_PROJECT=	Celero
 USE_LDCONFIG=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+USE_GCC=	yes
+.else
 # workaround for breakage with clang-10: https://github.com/DigitalInBlue/Celero/issues/142
 LLVM_VER=	80
 BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
 CPP=		clang-cpp${LLVM_VER}
 CC=		clang${LLVM_VER}
 CXX=		clang++${LLVM_VER}
+.if ${ARCH} == powerpc64
+CFLAGS+=	-mabi=elfv2
+.endif
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: branches/2020Q2
===================================================================
--- branches/2020Q2	(revision 532697)
+++ branches/2020Q2	(revision 532698)

Property changes on: branches/2020Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r532697