diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-07-21 19:15:59 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-07-25 00:45:08 -0400 |
| commit | 7721b923d53fb9eb93f80bb93b4c3bd976c05b4c (patch) | |
| tree | edc61b1ed9885e442c7327460052f10d1ca589fa /compiler/GHC.hs | |
| parent | 73145d57f961c73b5853da7881d6a21e48e05909 (diff) | |
| download | haskell-7721b923d53fb9eb93f80bb93b4c3bd976c05b4c.tar.gz | |
Move GHC.Platform into the compiler
Previously it was in ghc-boot so that ghc-pkg could use it. However it
wasn't necessary because ghc-pkg only uses a subset of it: reading
target arch and OS from the settings file. This is now done via
GHC.Platform.ArchOS (was called PlatformMini before).
Diffstat (limited to 'compiler/GHC.hs')
| -rw-r--r-- | compiler/GHC.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/GHC.hs b/compiler/GHC.hs index c7fac76828..22ce5fac18 100644 --- a/compiler/GHC.hs +++ b/compiler/GHC.hs @@ -1683,11 +1683,11 @@ interpretPackageEnv dflags = do where -- Loading environments (by name or by location) - platformArchOs = platformMini (targetPlatform dflags) + archOS = platformArchOS (targetPlatform dflags) namedEnvPath :: String -> MaybeT IO FilePath namedEnvPath name = do - appdir <- versionedAppDir (programName dflags) platformArchOs + appdir <- versionedAppDir (programName dflags) archOS return $ appdir </> "environments" </> name probeEnvName :: String -> MaybeT IO FilePath @@ -1724,7 +1724,7 @@ interpretPackageEnv dflags = do -- e.g. .ghc.environment.x86_64-linux-7.6.3 localEnvFileName :: FilePath - localEnvFileName = ".ghc.environment" <.> versionedFilePath platformArchOs + localEnvFileName = ".ghc.environment" <.> versionedFilePath archOS -- Search for an env file, starting in the current dir and looking upwards. -- Fail if we get to the users home dir or the filesystem root. That is, |