[commit: ghc] wip/angerman/win32-cross-2: Cleanup LD detection. (cc438e0)

[git at git.haskell.org]

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

On branch  : wip/angerman/win32-cross-2
Link       : http://ghc.haskell.org/trac/ghc/changeset/cc438e0aba6003da5891267e373686eff25a8dbf/ghc

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

commit cc438e0aba6003da5891267e373686eff25a8dbf
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Thu Mar 8 11:12:46 2018 +0800

    Cleanup LD detection.


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

cc438e0aba6003da5891267e373686eff25a8dbf
 aclocal.m4      | 3 ++-
 mk/config.mk.in | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index a2fdbdc..cc25517 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2359,7 +2359,8 @@ AC_DEFUN([FIND_LD],[
                    FP_CC_LINKER_FLAG_TRY(bfd, $2) ;;
               "GNU gold"*)
                    FP_CC_LINKER_FLAG_TRY(gold, $2)
-                   LD_NO_GOLD=ld
+                   LD_NO_GOLD=
+                   AC_CHECK_TARGET_TOOL([LD_NO_GOLD],[ld])
                    ;;
               "LLD"*)
                    FP_CC_LINKER_FLAG_TRY(lld, $2) ;;
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 92830fa..846857d 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -537,7 +537,7 @@ AS_STAGE1       = $(AS)
 AS_STAGE2       = $(AS)
 AS_STAGE3       = $(AS)
 
-# why no LD=@LD@ ?
+LD              = @LD@
 LD_STAGE0       = @LD_STAGE0@
 LD_STAGE1       = $(LD)
 LD_STAGE2       = $(LD)