[commit: ghc] wip/angerman/win32-cross: Cleanup LD detection. (8aca758)
git at git.haskell.org
git at git.haskell.org
Tue Mar 13 04:15:02 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/angerman/win32-cross
Link : http://ghc.haskell.org/trac/ghc/changeset/8aca7585d4da0e808fe1947b86f2c301ba050ee6/ghc
>---------------------------------------------------------------
commit 8aca7585d4da0e808fe1947b86f2c301ba050ee6
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date: Thu Mar 8 11:12:46 2018 +0800
Cleanup LD detection.
>---------------------------------------------------------------
8aca7585d4da0e808fe1947b86f2c301ba050ee6
aclocal.m4 | 3 ++-
mk/config.mk.in | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 528fd0c..92f542d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2362,7 +2362,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)
More information about the ghc-commits
mailing list