[Git][ghc/ghc][wip/toolchain-selection] Fixes

[Rodrigo Mesquita (@alt-romes)]

Rodrigo Mesquita pushed to branch wip/toolchain-selection at Glasgow Haskell Compiler / GHC


Commits:
c755b216 by Rodrigo Mesquita at 2023-06-19T12:07:53+01:00
Fixes

- - - - -


2 changed files:

- default.target.in
- utils/ghc-toolchain/src/GHC/Toolchain/Tools/MergeObjs.hs


Changes:

=====================================
default.target.in
=====================================
@@ -6,7 +6,7 @@ Target
 , tgtWordSize = WS at TargetWordSize@
 , tgtEndianness = @TargetEndianness@
 , tgtSymbolsHaveLeadingUnderscore = @LeadingUnderscoreBool@
-, tgtLlvmTarget = "@LlvmTarget@"
+, tgtLlvmTarget = "@LlvmTarget_CPP@"
 , tgtUnregisterised = @UnregisterisedBool@
 , tgtTablesNextToCode = @TablesNextToCodeBool@
 , tgtUseLibffiForAdjustors = @UseLibffiForAdjustorsBool@


=====================================
utils/ghc-toolchain/src/GHC/Toolchain/Tools/MergeObjs.hs
=====================================
@@ -23,7 +23,7 @@ newtype MergeObjs = MergeObjs { mergeObjsProgram :: Program
 
 findMergeObjs :: ProgOpt -> Cc -> CcLink -> Nm -> M MergeObjs
 findMergeObjs progOpt cc ccLink nm = checking "for linker for merging objects" $ do
-    prog <- findProgram "linker for merging objects" progOpt ["ld"]
+    prog <- findProgram "linker for merging objects" progOpt ["ld.gold", "ld"]
     let mo = MergeObjs $ over _prgFlags (++["-r"]) prog
     checkMergingWorks cc nm mo
     checkForGoldT22266 cc ccLink mo



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c755b2163a69cddb5fe64f208361bb03965f890f

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c755b2163a69cddb5fe64f208361bb03965f890f
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230619/bf547e8f/attachment-0001.html>