[Git][ghc/ghc][wip/hadrian-cross-stage2] fix distrib/configure file

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/hadrian-cross-stage2 at Glasgow Haskell Compiler / GHC


Commits:
e608df5c by Matthew Pickering at 2024-09-26T14:19:15+01:00
fix distrib/configure file

- - - - -


3 changed files:

- hadrian/cfg/system.config.in
- hadrian/src/Oracles/Setting.hs
- hadrian/src/Rules/Generate.hs


Changes:

=====================================
hadrian/cfg/system.config.in
=====================================
@@ -50,6 +50,8 @@ use-ghc-toolchain    = @EnableGhcToolchain@
 #     And we can reconstruct the platform info using targetPlatformTriple
 # Q: What is TargetPlatformFull?
 target-platform-full  = @TargetPlatformFull@
+build-platform-full   = @BuildPlatformFull@
+host-platform-full    = @HostPlatformFull@
 
 cross-compiling       = @CrossCompiling@
 


=====================================
hadrian/src/Oracles/Setting.hs
=====================================
@@ -59,6 +59,8 @@ data ProjectSetting =
              | ProjectPatchLevel2
              | SystemGhc
              | TargetPlatformFull
+             | BuildPlatformFull
+             | HostPlatformFull
              | BourneShell
              | EmsdkVersion
 
@@ -121,6 +123,8 @@ setting key = lookupSystemConfig $ case key of
     ProjectPatchLevel2 -> "project-patch-level2"
     SystemGhc          -> "system-ghc"
     TargetPlatformFull -> "target-platform-full"
+    BuildPlatformFull  -> "build-platform-full"
+    HostPlatformFull   -> "host-platform-full"
     BourneShell        -> "bourne-shell"
     EmsdkVersion       -> "emsdk-version"
 


=====================================
hadrian/src/Rules/Generate.hs
=====================================
@@ -403,12 +403,17 @@ bindistRules = do
     , interpolateVar "TablesNextToCode" $ yesNo <$> getTarget tgtTablesNextToCode
     , interpolateVar "TargetHasLibm" $ yesNo <$> interp (staged (buildFlag TargetHasLibm))
     , interpolateVar "TargetPlatform" $ getTarget targetPlatformTriple
+    , interpolateVar "BuildPlatform"  $ interp $ queryBuild targetPlatformTriple
+    , interpolateVar "HostPlatform"   $ interp $ queryHost targetPlatformTriple
     , interpolateVar "TargetWordBigEndian" $ getTarget isBigEndian
     , interpolateVar "TargetWordSize" $ getTarget wordSize
     , interpolateVar "Unregisterised" $ yesNo <$> getTarget tgtUnregisterised
     , interpolateVar "UseLibdw" $ fmap yesNo $ interp $ staged (buildFlag UseLibdw)
     , interpolateVar "UseLibffiForAdjustors" $ yesNo <$> getTarget tgtUseLibffiForAdjustors
     , interpolateVar "GhcWithSMP" $ yesNo <$> targetSupportsSMP Stage2
+    , interpolateVar "TargetPlatformFull" (setting TargetPlatformFull)
+    , interpolateVar "BuildPlatformFull" (setting BuildPlatformFull)
+    , interpolateVar "HostPlatformFull"  (setting HostPlatformFull)
     ]
   where
     interp = interpretInContext (semiEmptyTarget Stage2)



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e608df5ced6b207e9422f1401b139bf4f505e3f7
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/20240926/8a929a53/attachment-0001.html>