From 4b0d441cc4db398222efc17973386ea0fe897a41 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Tue, 30 Oct 2018 14:56:23 +0100
Subject: [PATCH 1/2] rustc: build with system llvm and jemalloc
Just like fedora does: https://src.fedoraproject.org/rpms/rust/blob/master/f/rust.spec
Also some cleanup of tests which were removed but no longer exist.
---
pkgs/development/compilers/rust/default.nix | 2 +-
pkgs/development/compilers/rust/rustc.nix | 54 +++++++++------------
pkgs/top-level/all-packages.nix | 1 +
3 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index a925127596d..9e697155f96 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -29,7 +29,7 @@ in rec {
./patches/disable-test-inherit-env.patch
];
- forceBundledLLVM = true;
+ withBundledLLVM = false;
configureFlags = [ "--release-channel=stable" ];
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index decf14a3294..48710753d80 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0e44d05849..827e8718f0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7324,6 +7324,7 @@ with pkgs;
# For beta and nightly releases use the nixpkgs-mozilla overlay
rust = callPackage ../development/compilers/rust ({
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+ llvm = llvm_7;
} // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
});
From 973eca740bec22df9760f9db9e1e66f3e5f6c164 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Thu, 8 Nov 2018 12:58:56 +0100
Subject: [PATCH 2/2] rustc: fix build with unbundled jemalloc and llvm on
darwin
jemalloc with stripped prefix would cause segfaults in free:
https://github.com/NixOS/nixpkgs/pull/49557#issuecomment-436734677
Thanks to @danieldk for darwin testing/debugging.
---
pkgs/development/compilers/rust/rustc.nix | 5 ++++-
.../development/libraries/jemalloc/common.nix | 19 ++++++++++++-------
.../libraries/jemalloc/default.nix | 2 --
.../libraries/jemalloc/jemalloc450.nix | 4 +---
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 48710753d80..3ec08a82d01 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -20,6 +20,8 @@ let
llvmShared = llvm.override { enableSharedLibraries = true; };
+ prefixedJemalloc = jemalloc.override { stripPrefix = false; };
+
target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
in
@@ -43,6 +45,7 @@ stdenv.mkDerivation {
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 && !withBundledLLVM) "-lc++"
++ optional stdenv.isDarwin "-rpath ${llvmShared}/lib";
# Enable nightly features in stable compiles (used for
@@ -59,7 +62,7 @@ stdenv.mkDerivation {
configureFlags = configureFlags
++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath"
"--enable-vendor"
- "--jemalloc-root=${jemalloc}/lib"
+ "--jemalloc-root=${prefixedJemalloc}/lib"
"--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ]
++ optional (targets != []) "--target=${target}";
diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix
index 593f4411f19..5ac1067d92f 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/pkgs/development/libraries/jemalloc/common.nix
@@ -1,6 +1,13 @@
-{ stdenv, fetchurl, version, sha256, ... }@args:
+{ version, sha256 }:
+{ stdenv, fetchurl,
+# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
+# then stops downstream builds (mariadb in particular) from detecting it. This
+# option should remove the prefix and give us a working jemalloc.
+# Causes segfaults with some software (ex. rustc), but defaults to true for backward
+# compatibility. Ignored on non OSX.
+stripPrefix ? true }:
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
name = "jemalloc-${version}";
inherit version;
@@ -9,10 +16,8 @@ stdenv.mkDerivation (rec {
inherit sha256;
};
- # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which
- # then stops downstream builds (mariadb in particular) from detecting it. This
- # option should remove the prefix and give us a working jemalloc.
- configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix=";
+ # see the comment on stripPrefix
+ configureFlags = stdenv.lib.optional (stdenv.isDarwin && stripPrefix) "--with-jemalloc-prefix=";
doCheck = true;
enableParallelBuilding = true;
@@ -28,4 +33,4 @@ stdenv.mkDerivation (rec {
platforms = platforms.all;
maintainers = with maintainers; [ wkennington ];
};
-} // (builtins.removeAttrs args [ "stdenv" "fetchurl" "version" "sha256" ]))
+}
diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index 8cb7c1f9673..7ea7bccd6b8 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, fetchpatch }:
import ./common.nix {
- inherit stdenv fetchurl;
version = "5.1.0";
sha256 = "0s3jpcyhzia8d4k0xyc67is78kg416p9yc3c2f9w6fhhqqffd5jk";
}
diff --git a/pkgs/development/libraries/jemalloc/jemalloc450.nix b/pkgs/development/libraries/jemalloc/jemalloc450.nix
index 00b38a85553..d328ab8016a 100644
--- a/pkgs/development/libraries/jemalloc/jemalloc450.nix
+++ b/pkgs/development/libraries/jemalloc/jemalloc450.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl }:
import ./common.nix {
- inherit stdenv fetchurl;
version = "4.5.0";
sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl";
-}
+}