summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2022-12-03 11:35:34 +0000
committertb <>2022-12-03 11:35:34 +0000
commitfe8cb345ce38f8f9987d4769df7eb413fd59ee02 (patch)
treee8bd654ebf3cc5784d4cab4c2c599b9c196567d2
parent9f0b51175f011ef96f149e69af59cc3a16799d09 (diff)
downloadopenbsd-fe8cb345ce38f8f9987d4769df7eb413fd59ee02.tar.gz
openbsd-fe8cb345ce38f8f9987d4769df7eb413fd59ee02.tar.bz2
openbsd-fe8cb345ce38f8f9987d4769df7eb413fd59ee02.zip
skip rust-openssl-tests on sparc64
The issue is likely that the build is trying to compile some generated C code with the prehistoric gcc from base, so add a tentative workaround for that. Since I don't currently have access to a sparc64 box where I could validate this easily and check if the workaround is enough, let's not waste lots of cycles on this.
-rw-r--r--src/regress/lib/libssl/rust-openssl/Makefile20
1 files changed, 17 insertions, 3 deletions
diff --git a/src/regress/lib/libssl/rust-openssl/Makefile b/src/regress/lib/libssl/rust-openssl/Makefile
index 88e231ec08..12bc319851 100644
--- a/src/regress/lib/libssl/rust-openssl/Makefile
+++ b/src/regress/lib/libssl/rust-openssl/Makefile
@@ -1,9 +1,13 @@
1# $OpenBSD: Makefile,v 1.1.1.1 2022/10/20 07:33:14 tb Exp $ 1# $OpenBSD: Makefile,v 1.2 2022/12/03 11:35:34 tb Exp $
2 2
3RUST_OPENSSL_TESTS = /usr/local/share/rust-openssl-tests 3RUST_OPENSSL_TESTS = /usr/local/share/rust-openssl-tests
4CARGO = /usr/local/bin/cargo 4CARGO = /usr/local/bin/cargo
5 5
6.if !exists(${RUST_OPENSSL_TESTS}) || !exists(${CARGO}) 6.if "${MACHINE_ARCH}" == sparc64
7regress:
8 @echo rust-openssl build is broken on sparc64
9 @echo SKIPPED
10.elif !exists(${RUST_OPENSSL_TESTS}) || !exists(${CARGO})
7regress: 11regress:
8 @echo packages rust-openssl-tests and rust are required for this regress 12 @echo packages rust-openssl-tests and rust are required for this regress
9 @echo SKIPPED 13 @echo SKIPPED
@@ -30,8 +34,18 @@ CLEANFILES += Cargo.lock
30CLEANFILES += Cargo.toml 34CLEANFILES += Cargo.toml
31. endif 35. endif
32 36
37# Use ports-clang on sparc64 since the build with base-gcc fails with:
38# error occurred: Command "cc" "-O0" "-ffunction-sections" "-fdata-sections" [...]
39# did not execute successfully (status code exit status: 1).
40. if "${MACHINE_ARCH}" == sparc64
41CARGO_CC=/usr/local/bin/clang
42. else
43CARGO_CC=cc
44. endif
45
33rust-openssl-test: ${_WORKSPACE_COOKIE} 46rust-openssl-test: ${_WORKSPACE_COOKIE}
34 cd ${.OBJDIR} && cargo test --offline --color=never -- --color=never 47 cd ${.OBJDIR} && env CC=${CARGO_CC} \
48 cargo test --offline --color=never -- --color=never
35 49
36CLEANFILES += ${_WORKSPACE_COOKIE} ${WORKSPACE_LINKS} 50CLEANFILES += ${_WORKSPACE_COOKIE} ${WORKSPACE_LINKS}
37 51