From c98c96200f5ee51a83ae1b27cba2df52a6a8a44c Mon Sep 17 00:00:00 2001 From: tb <> Date: Fri, 30 Oct 2020 03:12:40 +0000 Subject: botan2 uses C++11, so use ports-gcc on gcc-archs This makes this interop test pass on sparc64. --- src/regress/lib/libssl/interop/botan/Makefile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/regress/lib/libssl/interop/botan/Makefile b/src/regress/lib/libssl/interop/botan/Makefile index cc8016cafb..7d5435f9d2 100644 --- a/src/regress/lib/libssl/interop/botan/Makefile +++ b/src/regress/lib/libssl/interop/botan/Makefile @@ -1,11 +1,22 @@ -# $OpenBSD: Makefile,v 1.2 2020/10/29 06:05:12 tb Exp $ +# $OpenBSD: Makefile,v 1.3 2020/10/30 03:12:40 tb Exp $ + +.include .if ! exists(/usr/local/bin/botan) regress: # install botan2 from ports for interop tests @echo SKIPPED +.elif (${COMPILER_VERSION:L} != "clang" && ! exists(/usr/local/bin/eg++)) +regress: + # on gcc-archs install g++ from ports for botan2 interop tests + @echo SKIPPED .else +# C++11 +.if ${COMPILER_VERSION:L} != "clang" && ${CXX} == "c++" +CXX = /usr/local/bin/eg++ +.endif + LIBRARIES = libressl .if exists(/usr/local/bin/eopenssl) LIBRARIES += openssl -- cgit v1.2.3-55-g6feb