[Git][ghc/ghc][wip/toolchain-selection] Address review

Rodrigo Mesquita (@alt-romes) gitlab at gitlab.haskell.org
Mon Jul 17 17:53:04 UTC 2023



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


Commits:
b268686c by Rodrigo Mesquita at 2023-07-17T18:52:57+01:00
Address review

- - - - -


3 changed files:

- − TODO
- hadrian/src/Rules/BinaryDist.hs
- utils/ghc-toolchain/src/GHC/Toolchain/Target.hs


Changes:

=====================================
TODO deleted
=====================================
@@ -1,9 +0,0 @@
-Things that might get done on this or another MR
-[ ] Guarantee flags passed to configure are eventually passed to ghc-toolchain (like CFLAGS=...) explicitly specified
-[ ] Drop SettingsXXXX altogether, now we just have the toolchain (well, this goes with deleting a good part of configure)
-[x] Readelf is only used to find cc link, that OK?
-[-] In hadrian/src/Rules/Generate.hs, generateGhcPlatformH, factor out the query into an argument to chooseSetting, to deduplicate it
-[ ] Get rid of all the ToolchainSettings in Hadrian still (e.g. settings-clang-command)
-[ ] Write Note about dummy values in default.host.target
-[x] Don't put default.*.targets on the root folder.
-[x] The $$tooldir substitution didn't seem to be working when issued by hadrian.


=====================================
hadrian/src/Rules/BinaryDist.hs
=====================================
@@ -216,7 +216,6 @@ bindistRules = do
         -- looking for the settings files.
         unless windowsHost $
             removeFile (bindistFilesDir -/- "lib" -/- "settings")
-            removeFile (bindistFilesDir -/- "lib" -/- "settings")
 
         unless cross $ need ["docs"]
 


=====================================
utils/ghc-toolchain/src/GHC/Toolchain/Target.hs
=====================================
@@ -54,7 +54,7 @@ data Target = Target
       -- GHC capabilities
     , tgtUnregisterised :: Bool
     , tgtTablesNextToCode :: Bool
-    -- , tgtHasThreadedRts :: Bool -- Do we need this for each target? Or just when bootstrapping?
+    -- , tgtHasThreadedRts :: Bool -- We likely just need this when bootstrapping
     , tgtUseLibffiForAdjustors :: Bool -- We need to know whether or not to include libffi headers, and generate additional code for it
 
       -- C toolchain



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b268686c79b065d860651d2b0227e6e3c086ef62
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/20230717/5f32af3b/attachment-0001.html>


More information about the ghc-commits mailing list