From 49670c1200131749f5cf254b68b96d536714826d Mon Sep 17 00:00:00 2001 From: naddy Date: Fri, 9 Nov 2018 23:23:35 +0000 Subject: [PATCH] Do not clobber CC from the qt5 module, the build framework uses CC=@CXX@. This means C++ code will be linked with c++(1) and lld will be happy. --- security/xca/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/security/xca/Makefile b/security/xca/Makefile index a0d667ecf1e..6c35d1c1ef9 100644 --- a/security/xca/Makefile +++ b/security/xca/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.22 2018/09/14 16:02:37 sthen Exp $ +# $OpenBSD: Makefile,v 1.23 2018/11/09 23:23:35 naddy Exp $ COMMENT= create and manage certificates, CSRs, keys, etc V= 2.1.1 DISTNAME= xca-$V +REVISION= 0 CATEGORIES= security x11 HOMEPAGE= https://hohnstaedt.de/xca/ @@ -13,7 +14,7 @@ MAINTAINER= Stuart Henderson # BSD PERMIT_PACKAGE_CDROM= Yes -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Sql Qt5Widgets c crypto ltdl +WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Sql Qt5Widgets c crypto ltdl m MASTER_SITES= https://github.com/chris2511/xca/releases/download/RELEASE.${V}/ @@ -37,3 +38,6 @@ RUN_DEPENDS= devel/desktop-file-utils \ NO_TEST= Yes .include + +# do not clobber CC from the qt5 module, the build framework uses CC=@CXX@ +MAKE_FLAGS:= ${MAKE_FLAGS:NCC=*}