[commit: ghc] ghc-8.4: configure: Enable LD_NO_GOLD is set in all codepaths (89c10eb)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.4
Link       : http://ghc.haskell.org/trac/ghc/changeset/89c10eb88e955b8abd28f85e342a4de501731e50/ghc

>---------------------------------------------------------------

commit 89c10eb88e955b8abd28f85e342a4de501731e50
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Mar 2 16:13:53 2018 -0500

    configure: Enable LD_NO_GOLD is set in all codepaths
    
    Test Plan: `./configure --disable-ld-override; make; make install`
    
    Reviewers: trofi, hvr
    
    Reviewed By: trofi
    
    Subscribers: rwbarton, thomie, erikd, carter, simonmar
    
    GHC Trac Issues: #14675
    
    Differential Revision: https://phabricator.haskell.org/D4448
    
    (cherry picked from commit bc1bcaa2c0c66fb247d1338d6d0055a833918a7f)


>---------------------------------------------------------------

89c10eb88e955b8abd28f85e342a4de501731e50
 aclocal.m4 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/aclocal.m4 b/aclocal.m4
index cf93474..c02c1d1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2394,12 +2394,16 @@ AC_DEFUN([FIND_LD],[
 
         # Fallback
         AC_CHECK_TARGET_TOOL([LD], [ld])
+        # This isn't entirely safe since $LD may have been discovered to be
+        $ ld.gold, but what else can we do?
+        if test "x$LD_NO_GOLD" = "x"; then LD_NO_GOLD=$LD; fi
     }
 
     if test "x$enable_ld_override" = "xyes"; then
         find_ld
     else
         AC_CHECK_TARGET_TOOL([LD], [ld])
+        if test "x$LD_NO_GOLD" = "x"; then LD_NO_GOLD=$LD; fi
     fi
 
     CHECK_LD_COPY_BUG([$1])