summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorhe <he@pkgsrc.org>2022-04-23 15:54:34 +0000
committerhe <he@pkgsrc.org>2022-04-23 15:54:34 +0000
commitd47ad804bde452978f321f14b547638de76eceda (patch)
tree6250b624ae18cfdaacffdea91097dab17d941cc9 /lang
parenta091c35a4316dda8d09e2d8ee0e0b65950908872 (diff)
downloadpkgsrc-d47ad804bde452978f321f14b547638de76eceda.tar.gz
lang/rust: don't depend in libunwind, does not appear to be required.
Also remove the workaround for PR#56791, now that sparc64 can build rust without the "rust-llvm" option set.
Diffstat (limited to 'lang')
-rw-r--r--lang/rust/options.mk12
1 files changed, 1 insertions, 11 deletions
diff --git a/lang/rust/options.mk b/lang/rust/options.mk
index 2efaf460aba..757a9a77e59 100644
--- a/lang/rust/options.mk
+++ b/lang/rust/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2022/04/18 14:59:59 he Exp $
+# $NetBSD: options.mk,v 1.22 2022/04/23 15:54:34 he Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.rust
PKG_SUPPORTED_OPTIONS+= rust-cargo-static rust-docs
@@ -20,15 +20,6 @@ PKG_SUGGESTED_OPTIONS+= rust-llvm
PKG_SUGGESTED_OPTIONS+= rust-cargo-static
.endif
-# (NetBSD)/sparc64 systems fail to build libunwind 13.0.1,
-# and libunwind is depended on here unless rust-llvm is turned
-# on. The latter succeeds, though. So default to using
-# rust-llvm on NetBSD/sparc64.
-# Ref. PR#56791
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
-PKG_SUGGESTED_OPTIONS+= rust-llvm
-.endif
-
.include "../../mk/bsd.options.mk"
#
@@ -37,7 +28,6 @@ PKG_SUGGESTED_OPTIONS+= rust-llvm
#
.if empty(PKG_OPTIONS:Mrust-llvm)
BUILDLINK_API_DEPENDS.llvm+= llvm>=12.0.0
-.include "../../lang/libunwind/buildlink3.mk"
.include "../../lang/llvm/buildlink3.mk"
CONFIGURE_ARGS+= --enable-llvm-link-shared
#CONFIGURE_ARGS+= --llvm-libunwind=system