summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2022-12-05 14:43:06 +0000
committertb <>2022-12-05 14:43:06 +0000
commitb6516d68c9d9a37dbdd513e55e0198d2f0b389d3 (patch)
tree5923b49f3b5067744f946e39c5fbeb460e965e2b /src
parenta06d9e759c01ab233cfa26fab602368c28f16321 (diff)
downloadopenbsd-b6516d68c9d9a37dbdd513e55e0198d2f0b389d3.tar.gz
openbsd-b6516d68c9d9a37dbdd513e55e0198d2f0b389d3.tar.bz2
openbsd-b6516d68c9d9a37dbdd513e55e0198d2f0b389d3.zip
Unbreak rust-openssl-tests on sparc64
For the test compilation using the CC crate, base clang is good enough, so we don't need to pull in another heavy dependency just for this test.
Diffstat (limited to 'src')
-rw-r--r--src/regress/lib/libssl/rust-openssl/Makefile12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/regress/lib/libssl/rust-openssl/Makefile b/src/regress/lib/libssl/rust-openssl/Makefile
index 2a08dfea88..a243995f20 100644
--- a/src/regress/lib/libssl/rust-openssl/Makefile
+++ b/src/regress/lib/libssl/rust-openssl/Makefile
@@ -1,13 +1,9 @@
1# $OpenBSD: Makefile,v 1.3 2022/12/04 19:31:13 tb Exp $ 1# $OpenBSD: Makefile,v 1.4 2022/12/05 14:43:06 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 "${MACHINE_ARCH}" == sparc64 6.if !exists(${RUST_OPENSSL_TESTS}) || !exists(${CARGO})
7regress:
8 @echo rust-openssl build is broken on sparc64
9 @echo SKIPPED
10.elif !exists(${RUST_OPENSSL_TESTS}) || !exists(${CARGO})
11regress: 7regress:
12 @echo packages rust-openssl-tests and rust are required for this regress 8 @echo packages rust-openssl-tests and rust are required for this regress
13 @echo SKIPPED 9 @echo SKIPPED
@@ -34,11 +30,11 @@ CLEANFILES += Cargo.lock
34CLEANFILES += Cargo.toml 30CLEANFILES += Cargo.toml
35. endif 31. endif
36 32
37# Use ports-clang on sparc64 since the build with base-gcc fails with: 33# Force use of base-clang on sparc64 since the build with base-gcc fails with:
38# error occurred: Command "cc" "-O0" "-ffunction-sections" "-fdata-sections" [...] 34# error occurred: Command "cc" "-O0" "-ffunction-sections" "-fdata-sections" [...]
39# did not execute successfully (status code exit status: 1). 35# did not execute successfully (status code exit status: 1).
40. if "${MACHINE_ARCH}" == sparc64 36. if "${MACHINE_ARCH}" == sparc64
41CARGO_CC=/usr/local/bin/clang 37CARGO_CC=/usr/bin/clang
42. else 38. else
43CARGO_CC=cc 39CARGO_CC=cc
44. endif 40. endif