[pkgsrc/trunk]: pkgsrc/lang/rust Evidently, cmake is needed in all cases.

[he <he%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4e954d56a008
branches:  trunk
changeset: 455789:4e954d56a008
user:      he <he%pkgsrc.org@localhost>
date:      Sun Jul 11 22:13:38 2021 +0000

description:
Evidently, cmake is needed in all cases.

Move cmake dependency out of condition on PKG_OPTIONS.rust-llvm.

diffstat:

 lang/rust/Makefile   |  4 +++-
 lang/rust/options.mk |  7 ++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 150bcc5f56a5 -r 4e954d56a008 lang/rust/Makefile
--- a/lang/rust/Makefile        Sun Jul 11 21:24:13 2021 +0000
+++ b/lang/rust/Makefile        Sun Jul 11 22:13:38 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.241 2021/06/13 12:19:16 he Exp $
+# $NetBSD: Makefile,v 1.242 2021/07/11 22:13:38 he Exp $
 
 DISTNAME=      rustc-1.52.1-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -594,6 +594,8 @@
 DEPENDS+=      libatomic-links>=0:../../devel/libatomic-links
 .endif
 
+BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+.include "../../devel/cmake/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 150bcc5f56a5 -r 4e954d56a008 lang/rust/options.mk
--- a/lang/rust/options.mk      Sun Jul 11 21:24:13 2021 +0000
+++ b/lang/rust/options.mk      Sun Jul 11 22:13:38 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2021/04/04 08:51:20 he Exp $
+# $NetBSD: options.mk,v 1.15 2021/07/11 22:13:38 he Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.rust
 PKG_SUPPORTED_OPTIONS+=        rust-cargo-static
@@ -26,10 +26,7 @@
 # Use the internal copy of LLVM.
 # This contains some extra optimizations.
 #
-.if !empty(PKG_OPTIONS:Mrust-llvm)
-BUILD_DEPENDS+=        cmake-[0-9]*:../../devel/cmake
-.include "../../devel/cmake/buildlink3.mk"
-.else
+.if empty(PKG_OPTIONS:Mrust-llvm)
 .include "../../lang/llvm/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-llvm-link-shared
 CONFIGURE_ARGS+=       --llvm-root=${BUILDLINK_PREFIX.llvm}