lol

rust: unbreak building with bundled LLVM

authored by

Maximilian Güntner and committed by zimbatm.tngl.sh e30e2010 1d6eaac7

+4 -1
+4 -1
pkgs/development/compilers/rust/rustc.nix
··· 48 48 configureFlags = configureFlags 49 49 ++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] 50 50 ++ [ "--enable-vendor" "--disable-locked-deps" ] 51 - ++ [ "--enable-llvm-link-shared" ] 52 51 # ++ [ "--jemalloc-root=${jemalloc}/lib" 53 52 ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils.out}/bin/ar" ] 53 + ++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ] 54 54 ++ optional (stdenv.cc.cc ? isClang) "--enable-clang" 55 55 ++ optional (targets != []) "--target=${target}" 56 56 ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; 57 57 58 58 patches = patches ++ targetPatches; 59 + 60 + # the rust build system complains that nix alters the checksums 61 + dontFixLibtool = true; 59 62 60 63 passthru.target = target; 61 64