diff options
| author | Maximilian Güntner <code@sourcediver.org> | 2017-10-07 00:12:22 +0200 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2017-10-23 00:30:46 +0100 |
| commit | e30e2010277da6814c6828b199c778774b3ba00a (patch) | |
| tree | d54a851c84fd0fd8c1f2eb6eb2bf43c982dc1ab3 /pkgs/development/compilers | |
| parent | 1d6eaac764120c3498080275091bb6649144abb9 (diff) | |
| download | nixpkgs-e30e2010277da6814c6828b199c778774b3ba00a.tar nixpkgs-e30e2010277da6814c6828b199c778774b3ba00a.tar.gz nixpkgs-e30e2010277da6814c6828b199c778774b3ba00a.tar.bz2 nixpkgs-e30e2010277da6814c6828b199c778774b3ba00a.tar.lz nixpkgs-e30e2010277da6814c6828b199c778774b3ba00a.tar.xz nixpkgs-e30e2010277da6814c6828b199c778774b3ba00a.tar.zst nixpkgs-e30e2010277da6814c6828b199c778774b3ba00a.zip | |
rust: unbreak building with bundled LLVM
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/rust/rustc.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 73d78319b8c..6eb160add26 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -48,15 +48,18 @@ stdenv.mkDerivation { configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] ++ [ "--enable-vendor" "--disable-locked-deps" ] - ++ [ "--enable-llvm-link-shared" ] # ++ [ "--jemalloc-root=${jemalloc}/lib" ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ] + ++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ] ++ optional (stdenv.cc.cc ? isClang) "--enable-clang" ++ optional (targets != []) "--target=${target}" ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; patches = patches ++ targetPatches; + # the rust build system complains that nix alters the checksums + dontFixLibtool = true; + passthru.target = target; postPatch = '' |