From 644d4e9ac9b5e53fe298daa6544ff4d900cc9131 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 9 Jul 2016 17:19:18 +0300
Subject: [PATCH] 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).
---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 09b7769dc459..78da24f9c091 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.