From 55656a80c7c06a33f1a04c54b6ec9d315b6213f0 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 22 Jun 2023 18:53:31 +0200 Subject: [PATCH] use custom easyblock for Rust 1.65.0 --- .../r/Rust/Rust-1.65.0-GCCcore-12.2.0.eb | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/easybuild/easyconfigs/r/Rust/Rust-1.65.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/r/Rust/Rust-1.65.0-GCCcore-12.2.0.eb index 757f1d6d4bf..31a461e1867 100644 --- a/easybuild/easyconfigs/r/Rust/Rust-1.65.0-GCCcore-12.2.0.eb +++ b/easybuild/easyconfigs/r/Rust/Rust-1.65.0-GCCcore-12.2.0.eb @@ -1,5 +1,3 @@ -easyblock = 'ConfigureMake' - name = 'Rust' version = '1.65.0' @@ -28,31 +26,4 @@ dependencies = [ ('OpenSSL', '1.1', '', SYSTEM), ] -configopts = "--enable-extended --sysconfdir=%(installdir)s/etc " - -# avoid build dependency on Ninja, which requires Python, -# since Rust is a build dependency for cryptography that is included with Python -configopts += "--set=llvm.ninja=false " - -# Use ./x.py to bootstrap so that options like -j N are correctly passed through -# see: https://rustc-dev-guide.rust-lang.org/building/how-to-build-and-run.html#what-is-xpy -# (ConfigureMake already adds `-j %(parallel)s` to the `build_cmd`) -build_cmd = "./x.py build" -install_cmd = "./x.py install -j %(parallel)s" - -# avoid failure when home directory is an NFS mount, -# see https://github.com/rust-lang/cargo/issues/6652 -prebuildopts = "export CARGO_HOME=%(builddir)s/cargo && " -preinstallopts = prebuildopts - -sanity_check_paths = { - 'files': ['bin/cargo', 'bin/rustc', 'bin/rustdoc'], - 'dirs': ['lib/rustlib', 'share/doc', 'share/man'], -} - -sanity_check_commands = [ - "cargo --version", - "rustc --version", -] - moduleclass = 'lang'