summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2018-03-08 11:12:46 +0800
committerMoritz Angermann <moritz.angermann@gmail.com>2018-03-13 12:10:01 +0800
commit8aca7585d4da0e808fe1947b86f2c301ba050ee6 (patch)
tree56faaa15644a2d6a2bfd1c358ed7586402ed6e38
parent8638eb548c082a11ba3f0967ec223346e19b4031 (diff)
downloadhaskell-8aca7585d4da0e808fe1947b86f2c301ba050ee6.tar.gz
Cleanup LD detection.
-rw-r--r--aclocal.m43
-rw-r--r--mk/config.mk.in2
2 files changed, 3 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 528fd0c306..92f542d66a 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 92830fa1e8..846857ddc0 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)