Pull over change from main pkgsrc: alwas depend on cmake.

[Havard Eidnes <he%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Sat Sep 4 18:08:43 2021 +0000
Changeset:	70e34beb2e69027e3ccf5522163303fb597cc384

Modified Files:
	rust/Makefile
	rust/options.mk

Log Message:
Pull over change from main pkgsrc: alwas depend on cmake.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=70e34beb2e69027e3ccf5522163303fb597cc384

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

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

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index 30844471df..638629dc18 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -45,6 +45,9 @@ CONFIGURE_ARGS+=		--disable-dist-src
 CONFIGURE_ARGS+=		--disable-llvm-static-stdcpp
 CONFIGURE_ARGS+=		--disable-ninja
 
+# Work around gcc10 lossage related to BITWORDS_PER_ELEMENT analysis
+#CONFIGURE_ARGS+=		--set llvm.cxxflags=-Wno-error=array-bounds
+
 # Include (optional) settings to cross-build rust
 .include "cross.mk"
 
@@ -571,6 +574,8 @@ stage0-bootstrap: install
 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 --git a/rust/options.mk b/rust/options.mk
index a68f814ca5..9be0756a24 100644
--- a/rust/options.mk
+++ b/rust/options.mk
@@ -26,10 +26,7 @@ PKG_SUGGESTED_OPTIONS+=	rust-cargo-static
 # 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)
 # Rust 1.53.0 depends on llvm >= 10.0
 BUILDLINK_API_DEPENDS.llvm+=    llvm>=10.0
 .include "../../lang/llvm/buildlink3.mk"