diff options
| author | he <he@pkgsrc.org> | 2021-07-11 22:13:38 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2021-07-11 22:13:38 +0000 |
| commit | ffb6f70533f4bf6e997354d6bbac2024145fbbc9 (patch) | |
| tree | 2c6e01d5bce4bac78d72541e49ffac3dbe9e5576 /lang/rust | |
| parent | 95da6e815baca4b7da2248baed0c0bcb45c1b042 (diff) | |
| download | pkgsrc-ffb6f70533f4bf6e997354d6bbac2024145fbbc9.tar.gz | |
Evidently, cmake is needed in all cases.
Move cmake dependency out of condition on PKG_OPTIONS.rust-llvm.
Diffstat (limited to 'lang/rust')
| -rw-r--r-- | lang/rust/Makefile | 4 | ||||
| -rw-r--r-- | lang/rust/options.mk | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 99b0670d1dc..1b3708228dd 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -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 @@ BUILD_DEPENDS+= compat80>=0:../../emulators/compat80 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/lang/rust/options.mk b/lang/rust/options.mk index c5718ead82a..54ca9562281 100644 --- a/lang/rust/options.mk +++ b/lang/rust/options.mk @@ -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 @@ 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) .include "../../lang/llvm/buildlink3.mk" CONFIGURE_ARGS+= --enable-llvm-link-shared CONFIGURE_ARGS+= --llvm-root=${BUILDLINK_PREFIX.llvm} |