summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-07-09 17:19:18 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2016-07-09 17:19:18 +0300
commit644d4e9ac9b5e53fe298daa6544ff4d900cc9131 (patch)
treea7533a6c54e281a4302895d222676945e97258da /pkgs/stdenv
parent03f4690acb6808423faa759dbe9254a21b4c4c72 (diff)
downloadnixpkgs-644d4e9ac9b5e53fe298daa6544ff4d900cc9131.tar
nixpkgs-644d4e9ac9b5e53fe298daa6544ff4d900cc9131.tar.gz
nixpkgs-644d4e9ac9b5e53fe298daa6544ff4d900cc9131.tar.bz2
nixpkgs-644d4e9ac9b5e53fe298daa6544ff4d900cc9131.tar.lz
nixpkgs-644d4e9ac9b5e53fe298daa6544ff4d900cc9131.tar.xz
nixpkgs-644d4e9ac9b5e53fe298daa6544ff4d900cc9131.tar.zst
nixpkgs-644d4e9ac9b5e53fe298daa6544ff4d900cc9131.zip
Revert "Revert "make-bootstrap-tools: try again to fix on Darwin""
This reverts commit debd401b0f8bedae10c368abd0cacf75ef7f6350.

We must not use a single-binary build for the bootstrap since the common
binary gains a dynamic linkage to gmp (due to 'factor' and 'expr'
handling arbitrary-precision arithmetic).
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/darwin/make-bootstrap-tools.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 09b7769dc45..78da24f9c09 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -6,8 +6,8 @@ rec {
   coreutils_ = coreutils.override (args: {
     # We want coreutils without ACL support.
     aclSupport = false;
-    # Our tooling currently can't handle scripts in bin/, only ELFs and symlinks.
-    singleBinary = "symlinks";
+    # Problems otherwise, unlike Linux even with "symlinks".
+    singleBinary = false;
   });
 
   # Avoid debugging larger changes for now.