Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • hadrian/src/Hadrian/Oracles/TextFile.hs
    ... ... @@ -125,18 +125,7 @@ getBuildTarget = getTargetConfig buildTargetFile
    125 125
     
    
    126 126
     -- | Get the host target configuration through 'getTargetConfig'
    
    127 127
     getHostTarget :: Action Toolchain.Target
    
    128
    -getHostTarget = do
    
    129
    -  -- MP: If we are not cross compiling then we should use the target file in order to
    
    130
    -  -- build things for the host, in particular we want to use the configured values for the
    
    131
    -  -- target for building the RTS (ie are we using Libffi for adjustors, and the wordsize)
    
    132
    -  -- TODO: Use "flag CrossCompiling"
    
    133
    -  ht <- getTargetConfig hostTargetFile
    
    134
    -  tt <- getTargetConfig targetTargetFile
    
    135
    -  if (Toolchain.targetPlatformTriple ht) == (Toolchain.targetPlatformTriple tt)
    
    136
    -    then return tt
    
    137
    -    else return ht
    
    138
    -  -- where
    
    139
    -  --   msg = "The host's target configuration file " ++ quote hostTargetFile ++ " does not exist! ghc-toolchain might have failed to generate it."
    
    128
    +getHostTarget = getTargetConfig hostTargetFile
    
    140 129
     
    
    141 130
     -- | Get the target target configuration through 'getTargetConfig'
    
    142 131
     getTargetTarget :: Action Toolchain.Target