|
|
|
@ -1,9 +1,9 @@ |
|
|
|
|
{ stdenv, targetPackages |
|
|
|
|
{ stdenv, targetPackages, removeReferencesTo |
|
|
|
|
, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps |
|
|
|
|
, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl |
|
|
|
|
, which, libffi, gdb |
|
|
|
|
, version |
|
|
|
|
, forceBundledLLVM ? false |
|
|
|
|
, withBundledLLVM ? false |
|
|
|
|
, src |
|
|
|
|
, configureFlags ? [] |
|
|
|
|
, patches |
|
|
|
@ -40,7 +40,10 @@ stdenv.mkDerivation { |
|
|
|
|
# See https://github.com/NixOS/nixpkgs/pull/34227 |
|
|
|
|
stripDebugList = if stdenv.isDarwin then [ "bin" ] else null; |
|
|
|
|
|
|
|
|
|
NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; |
|
|
|
|
NIX_LDFLAGS = |
|
|
|
|
# when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' |
|
|
|
|
optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" |
|
|
|
|
++ optional stdenv.isDarwin "-rpath ${llvmShared}/lib"; |
|
|
|
|
|
|
|
|
|
# Enable nightly features in stable compiles (used for |
|
|
|
|
# bootstrapping, see https://github.com/rust-lang/rust/pull/37265). |
|
|
|
@ -54,13 +57,12 @@ stdenv.mkDerivation { |
|
|
|
|
# We need rust to build rust. If we don't provide it, configure will try to download it. |
|
|
|
|
# Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py |
|
|
|
|
configureFlags = configureFlags |
|
|
|
|
++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ] |
|
|
|
|
++ [ "--enable-vendor" ] |
|
|
|
|
# ++ [ "--jemalloc-root=${jemalloc}/lib" |
|
|
|
|
++ [ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ] |
|
|
|
|
++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ] |
|
|
|
|
++ optional (targets != []) "--target=${target}" |
|
|
|
|
++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}"; |
|
|
|
|
++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" |
|
|
|
|
"--enable-vendor" |
|
|
|
|
"--jemalloc-root=${jemalloc}/lib" |
|
|
|
|
"--default-linker=${targetPackages.stdenv.cc}/bin/cc" ] |
|
|
|
|
++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ] |
|
|
|
|
++ optional (targets != []) "--target=${target}"; |
|
|
|
|
|
|
|
|
|
# The bootstrap.py will generated a Makefile that then executes the build. |
|
|
|
|
# The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass |
|
|
|
@ -79,29 +81,13 @@ stdenv.mkDerivation { |
|
|
|
|
postPatch = '' |
|
|
|
|
patchShebangs src/etc |
|
|
|
|
|
|
|
|
|
# Fix dynamic linking against llvm |
|
|
|
|
#${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''} |
|
|
|
|
${optionalString (!withBundledLLVM) ''rm -rf src/llvm''} |
|
|
|
|
rm -rf src/jemalloc |
|
|
|
|
|
|
|
|
|
# Fix the configure script to not require curl as we won't use it |
|
|
|
|
sed -i configure \ |
|
|
|
|
-e '/probe_need CFG_CURL curl/d' |
|
|
|
|
|
|
|
|
|
# Fix the use of jemalloc prefixes which our jemalloc doesn't have |
|
|
|
|
# TODO: reenable if we can figure out how to get our jemalloc to work |
|
|
|
|
#[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs |
|
|
|
|
#[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+ |
|
|
|
|
|
|
|
|
|
# Disable fragile tests. |
|
|
|
|
rm -vr src/test/run-make-fulldeps/linker-output-non-utf8 || true |
|
|
|
|
rm -vr src/test/run-make-fulldeps/issue-26092 || true |
|
|
|
|
|
|
|
|
|
# Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 |
|
|
|
|
rm -vr src/test/ui/run-pass/issue-36023.rs || true |
|
|
|
|
|
|
|
|
|
# Disable test getting stuck on hydra - possible fix: |
|
|
|
|
# https://reviews.llvm.org/rL281650 |
|
|
|
|
rm -vr src/test/ui/run-pass/issue-36474.rs || true |
|
|
|
|
|
|
|
|
|
# On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)' |
|
|
|
|
sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs |
|
|
|
|
|
|
|
|
@ -137,14 +123,14 @@ stdenv.mkDerivation { |
|
|
|
|
# ps is needed for one of the test cases |
|
|
|
|
nativeBuildInputs = |
|
|
|
|
[ file python2 ps rustPlatform.rust.rustc git cmake |
|
|
|
|
which libffi |
|
|
|
|
which libffi removeReferencesTo |
|
|
|
|
] |
|
|
|
|
# Only needed for the debuginfo tests |
|
|
|
|
++ optional (!stdenv.isDarwin) gdb; |
|
|
|
|
|
|
|
|
|
buildInputs = [ ncurses ] ++ targetToolchains |
|
|
|
|
buildInputs = targetToolchains |
|
|
|
|
++ optional stdenv.isDarwin Security |
|
|
|
|
++ optional (!forceBundledLLVM) llvmShared; |
|
|
|
|
++ optional (!withBundledLLVM) llvmShared; |
|
|
|
|
|
|
|
|
|
outputs = [ "out" "man" "doc" ]; |
|
|
|
|
setOutputFlags = false; |
|
|
|
@ -165,6 +151,12 @@ stdenv.mkDerivation { |
|
|
|
|
|
|
|
|
|
inherit doCheck; |
|
|
|
|
|
|
|
|
|
# remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so |
|
|
|
|
# and thus a transitive dependency on ncurses |
|
|
|
|
postInstall = '' |
|
|
|
|
find $out/lib -name "*.so" -type f -exec remove-references-to -t ${llvmShared} '{}' '+' |
|
|
|
|
''; |
|
|
|
|
|
|
|
|
|
configurePlatforms = []; |
|
|
|
|
|
|
|
|
|
# https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764 |
|
|
|
|