diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2022-12-05 14:43:07 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2022-12-05 14:43:07 +0000 |
| commit | a0aed11acb56c17b402008db501faf2ebec4f03c (patch) | |
| tree | 4134635b92c510a27d9518798df8aaaef0d03625 /regress/lib/libssl | |
| parent | de7a6a260b1624b5273766ea70b9b17afa9d6634 (diff) | |
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 'regress/lib/libssl')
| -rw-r--r-- | regress/lib/libssl/rust-openssl/Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/regress/lib/libssl/rust-openssl/Makefile b/regress/lib/libssl/rust-openssl/Makefile index 2a08dfea883..a243995f204 100644 --- a/regress/lib/libssl/rust-openssl/Makefile +++ b/regress/lib/libssl/rust-openssl/Makefile @@ -1,13 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2022/12/04 19:31:13 tb Exp $ +# $OpenBSD: Makefile,v 1.4 2022/12/05 14:43:06 tb Exp $ RUST_OPENSSL_TESTS = /usr/local/share/rust-openssl-tests CARGO = /usr/local/bin/cargo -.if "${MACHINE_ARCH}" == sparc64 -regress: - @echo rust-openssl build is broken on sparc64 - @echo SKIPPED -.elif !exists(${RUST_OPENSSL_TESTS}) || !exists(${CARGO}) +.if !exists(${RUST_OPENSSL_TESTS}) || !exists(${CARGO}) regress: @echo packages rust-openssl-tests and rust are required for this regress @echo SKIPPED @@ -34,11 +30,11 @@ CLEANFILES += Cargo.lock CLEANFILES += Cargo.toml . endif -# Use ports-clang on sparc64 since the build with base-gcc fails with: +# Force use of base-clang on sparc64 since the build with base-gcc fails with: # error occurred: Command "cc" "-O0" "-ffunction-sections" "-fdata-sections" [...] # did not execute successfully (status code exit status: 1). . if "${MACHINE_ARCH}" == sparc64 -CARGO_CC=/usr/local/bin/clang +CARGO_CC=/usr/bin/clang . else CARGO_CC=cc . endif |