git.iko.soy/typeable/nixpkgs
on master help sign in
build-rust-crate: disable incremental builds
commitff5ff66ef3c0107bd586f3521a9453e2bb4c84d8 authorzseri <zseri.devel@ytrizja.de> dateThu 25 Mar 2021, 16:52 (6 years ago) parent18165d6
2 files changed+9−7
pkgs/build-support/rust/build-rust-crate/build-crate.nix+8−6 pkgs/build-support/rust/build-rust-crate/configure-crate.nix+1−1
pkgs/build-support/rust/build-rust-crate/build-crate.nix+8−6
@@ -9,12 +9,14 @@
99
1010 let
1111 baseRustcOpts =
12− [(if release then "-C opt-level=3" else "-C debuginfo=2")]
13− ++ ["-C codegen-units=$NIX_BUILD_CORES"]
14− ++ ["--remap-path-prefix=$NIX_BUILD_TOP=/" ]
15− ++ [(mkRustcDepArgs dependencies crateRenames)]
16− ++ [(mkRustcFeatureArgs crateFeatures)]
17− ++ extraRustcOpts
12+ [
13+ (if release then "-C opt-level=3" else "-C debuginfo=2")
14+ "-C codegen-units=$NIX_BUILD_CORES"
15+ "-C incremental=no"
16+ "--remap-path-prefix=$NIX_BUILD_TOP=/"
17+ (mkRustcDepArgs dependencies crateRenames)
18+ (mkRustcFeatureArgs crateFeatures)
19+ ] ++ extraRustcOpts
1820 ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--target ${rust.toRustTargetSpec stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc"
1921 # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude
2022 # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022
pkgs/build-support/rust/build-rust-crate/configure-crate.nix+1−1
@@ -24,7 +24,7 @@ let version_ = lib.splitString "-" crateVersion;
2424 version = lib.splitVersion (lib.head version_);
2525 rustcOpts = lib.foldl' (opts: opt: opts + " " + opt)
2626 (if release then "-C opt-level=3" else "-C debuginfo=2")
27− (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
27+ (["-C codegen-units=$NIX_BUILD_CORES -C incremental=no"] ++ extraRustcOpts);
2828 buildDeps = mkRustcDepArgs buildDependencies crateRenames;
2929 authors = lib.concatStringsSep ":" crateAuthors;
3030 optLevel = if release then 3 else 0;