From ffbdcbfe29ea1076e87a321f47df39cd1ddc4d6b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 10 Oct 2014 14:01:38 +0200
Subject: [PATCH] gcc-wrapper: Wrap ld.gold
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This ensures that gcc's ‘-fuse-ld=gold’ flag works.
---
 pkgs/build-support/gcc-wrapper/default.nix |  8 ++++++++
 pkgs/stdenv/adapters.nix                   | 20 +++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index 5b80c92acbf..1af35f58a3f 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -143,6 +143,14 @@ stdenv.mkDerivation {
 
       wrap ld ${./ld-wrapper.sh} $ld
 
+      if [ -e $binutils/bin/ld.gold ]; then
+        wrap ld.gold ${./ld-wrapper.sh} $binutils/bin/ld.gold
+      fi
+
+      if [ -e $binutils/bin/ld.bfd ]; then
+        wrap ld.bfd ${./ld-wrapper.sh} $binutils/bin/ld.bfd
+      fi
+
       if [ -e $gccPath/gcc ]; then
         wrap gcc ${./gcc-wrapper.sh} $gccPath/gcc
         ln -s gcc $out/bin/cc
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index a90a00e6d4f..9e82359865b 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -285,19 +285,13 @@ rec {
     };
 
 
-  /* Modify a stdenv so that it uses the Gold linker. FIXME: should
-     use -fuse-ld=gold instead, but then the ld-wrapper won't be
-     invoked. */
-  useGoldLinker = stdenv:
-    let
-      binutils = stdenv.gcc.binutils;
-      binutils' = pkgs.runCommand "${binutils.name}-gold" { }
-        ''
-          mkdir -p $out/bin
-          ln -s ${binutils}/bin/* $out/bin/
-          ln -sfn ${binutils}/bin/ld.gold $out/bin/ld
-        ''; # */
-    in overrideGCC stdenv (stdenv.gcc.override { binutils = binutils'; });
+  /* Modify a stdenv so that it uses the Gold linker. */
+  useGoldLinker = stdenv: stdenv //
+    { mkDerivation = args: stdenv.mkDerivation (args // {
+        dontStrip = true;
+        NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_COMPILE or "") + " -fuse-ld=gold";
+      });
+    };
 
   dropCxx = drv: drv.override {
     stdenv = if pkgs.stdenv.isDarwin