summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2020-10-30 03:12:40 +0000
committertb <>2020-10-30 03:12:40 +0000
commitc98c96200f5ee51a83ae1b27cba2df52a6a8a44c (patch)
tree1945318720e8c9859985bff5986c67c0cd753801
parent95c9379bd7f97970855501776826f244aaf2482f (diff)
downloadopenbsd-c98c96200f5ee51a83ae1b27cba2df52a6a8a44c.tar.gz
openbsd-c98c96200f5ee51a83ae1b27cba2df52a6a8a44c.tar.bz2
openbsd-c98c96200f5ee51a83ae1b27cba2df52a6a8a44c.zip
botan2 uses C++11, so use ports-gcc on gcc-archs
This makes this interop test pass on sparc64.
-rw-r--r--src/regress/lib/libssl/interop/botan/Makefile13
1 files changed, 12 insertions, 1 deletions
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 @@
1# $OpenBSD: Makefile,v 1.2 2020/10/29 06:05:12 tb Exp $ 1# $OpenBSD: Makefile,v 1.3 2020/10/30 03:12:40 tb Exp $
2
3.include <bsd.own.mk>
2 4
3.if ! exists(/usr/local/bin/botan) 5.if ! exists(/usr/local/bin/botan)
4regress: 6regress:
5 # install botan2 from ports for interop tests 7 # install botan2 from ports for interop tests
6 @echo SKIPPED 8 @echo SKIPPED
9.elif (${COMPILER_VERSION:L} != "clang" && ! exists(/usr/local/bin/eg++))
10regress:
11 # on gcc-archs install g++ from ports for botan2 interop tests
12 @echo SKIPPED
7.else 13.else
8 14
15# C++11
16.if ${COMPILER_VERSION:L} != "clang" && ${CXX} == "c++"
17CXX = /usr/local/bin/eg++
18.endif
19
9LIBRARIES = libressl 20LIBRARIES = libressl
10.if exists(/usr/local/bin/eopenssl) 21.if exists(/usr/local/bin/eopenssl)
11LIBRARIES += openssl 22LIBRARIES += openssl