summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vinokurov <serg.foo@gmail.com>2022-01-05 01:33:06 +0000
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-01-18 16:15:12 -0500
commit21510698817fbe7254112b5967854cad28a612bf (patch)
tree6e520363978d7f20f5fc3ca3ab1c3d3a83693cb2
parent01254ceb5173ddb179c6ead0d6b60f7ac5a86e83 (diff)
downloadhaskell-21510698817fbe7254112b5967854cad28a612bf.tar.gz
Improve detection of lld linker
Newer lld versions may include vendor info in --version output and thus the version string may not start with ‘LLD’. Fixes #20907
-rw-r--r--compiler/GHC/SysTools/Info.hs2
-rw-r--r--m4/find_ld.m42
2 files changed, 3 insertions, 1 deletions
diff --git a/compiler/GHC/SysTools/Info.hs b/compiler/GHC/SysTools/Info.hs
index 12be61ea0b..83a76b9efb 100644
--- a/compiler/GHC/SysTools/Info.hs
+++ b/compiler/GHC/SysTools/Info.hs
@@ -142,7 +142,7 @@ getLinkerInfo' logger dflags = do
-- ELF specific flag, see Note [ELF needed shared libs]
return (GnuGold [Option "-Wl,--no-as-needed"])
- | any ("LLD" `isPrefixOf`) stdo =
+ | any (\line -> "LLD" `isPrefixOf` line || "LLD" `elem` words line) stdo =
return (LlvmLLD $ map Option [ --see Note [ELF needed shared libs]
"-Wl,--no-as-needed"])
diff --git a/m4/find_ld.m4 b/m4/find_ld.m4
index a6b5c9c598..3d4443be54 100644
--- a/m4/find_ld.m4
+++ b/m4/find_ld.m4
@@ -41,6 +41,8 @@ AC_DEFUN([FIND_LD],[
;;
"LLD"*)
FP_CC_LINKER_FLAG_TRY(lld, $2) ;;
+ *" LLD "*)
+ FP_CC_LINKER_FLAG_TRY(lld, $2) ;;
*) AC_MSG_NOTICE([unknown linker version $out]) ;;
esac
if test "z$$2" = "z"; then