Skip to content

Commit

Permalink
Clean Up OpenBSD a bit, 6.7 no longer supported, all support releases…
Browse files Browse the repository at this point in the history
… use ld.lld
  • Loading branch information
adamsteen committed Apr 5, 2021
1 parent 0eb8cb8 commit ac55b54
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
6 changes: 0 additions & 6 deletions configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,6 @@ config_host_openbsd()
cc_is_clang || die "Only 'clang' is supported on OpenBSD"
[ "${CONFIG_ARCH}" = "x86_64" ] ||
die "Only 'x86_64' is supported on OpenBSD"
if ! ld_is_lld; then
LD='/usr/bin/ld.lld'
warn "Using GNU 'ld' is not supported on OpenBSD"
warn "Falling back to 'ld.lld'"
[ -e ${LD} ] || die "/usr/bin/ld.lld does not exist"
fi

# On OpenBSD/clang we use -nostdlibinc which gives us access to the
# clang-provided headers for compiler instrinsics. We copy the rest
Expand Down
4 changes: 2 additions & 2 deletions tests/tests.bats
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ xen_expect_abort() {
}

@test "xnow hvt" {
skip_unless_host_is Linux OpenBSD_6.7
skip_unless_host_is Linux OpenBSD

hvt_run test_xnow/test_xnow.hvt
[ "$status" -eq 1 ] && [[ "$output" == *"host/guest translation fault"* ]]
Expand All @@ -336,7 +336,7 @@ xen_expect_abort() {
}

@test "wnox hvt" {
skip_unless_host_is OpenBSD_6.7
skip_unless_host_is OpenBSD

hvt_run test_wnox/test_wnox.hvt
[ "$status" -eq 1 ] && [[ "$output" == *"host/guest translation fault"* ]]
Expand Down

0 comments on commit ac55b54

Please sign in to comment.