diff options
| author | zseri <zseri.devel@ytrizja.de> | 2021-03-25 16:52:17 +0100 |
|---|---|---|
| committer | Milan <milan@petabyte.dev> | 2021-04-08 10:45:56 +0200 |
| commit | ff5ff66ef3c0107bd586f3521a9453e2bb4c84d8 (patch) | |
| tree | b779723d6885f9191985d5c13944d5b58e8b7c01 /pkgs/build-support/rust | |
| parent | 18165d64119f2343602fa497b8fcd3e8d4f5f705 (diff) | |
| download | nixpkgs-ff5ff66ef3c0107bd586f3521a9453e2bb4c84d8.tar nixpkgs-ff5ff66ef3c0107bd586f3521a9453e2bb4c84d8.tar.gz nixpkgs-ff5ff66ef3c0107bd586f3521a9453e2bb4c84d8.tar.bz2 nixpkgs-ff5ff66ef3c0107bd586f3521a9453e2bb4c84d8.tar.lz nixpkgs-ff5ff66ef3c0107bd586f3521a9453e2bb4c84d8.tar.xz nixpkgs-ff5ff66ef3c0107bd586f3521a9453e2bb4c84d8.tar.zst nixpkgs-ff5ff66ef3c0107bd586f3521a9453e2bb4c84d8.zip | |
build-rust-crate: disable incremental builds
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/build-crate.nix | 14 | ||||
| -rw-r--r-- | pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 84d1b2300f1..df3129d536d 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -9,12 +9,14 @@ let baseRustcOpts = - [(if release then "-C opt-level=3" else "-C debuginfo=2")] - ++ ["-C codegen-units=$NIX_BUILD_CORES"] - ++ ["--remap-path-prefix=$NIX_BUILD_TOP=/" ] - ++ [(mkRustcDepArgs dependencies crateRenames)] - ++ [(mkRustcFeatureArgs crateFeatures)] - ++ extraRustcOpts + [ + (if release then "-C opt-level=3" else "-C debuginfo=2") + "-C codegen-units=$NIX_BUILD_CORES" + "-C incremental=no" + "--remap-path-prefix=$NIX_BUILD_TOP=/" + (mkRustcDepArgs dependencies crateRenames) + (mkRustcFeatureArgs crateFeatures) + ] ++ extraRustcOpts ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--target ${rust.toRustTargetSpec stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022 diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index d1010ac1adb..3eaba1736fc 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -24,7 +24,7 @@ let version_ = lib.splitString "-" crateVersion; version = lib.splitVersion (lib.head version_); rustcOpts = lib.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") - (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); + (["-C codegen-units=$NIX_BUILD_CORES -C incremental=no"] ++ extraRustcOpts); buildDeps = mkRustcDepArgs buildDependencies crateRenames; authors = lib.concatStringsSep ":" crateAuthors; optLevel = if release then 3 else 0; |