Commit cf1ccd05 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

Whitespace, 80-col violations.

parent 71a965de
......@@ -226,7 +226,8 @@ guessToolFromGhcPath tool ghcProg verbosity searchpath
guessNormal = dir </> toolname <.> exeExtension
guessGhcVersioned = dir </> (toolname ++ "-ghc" ++ versionSuffix)
<.> exeExtension
guessVersioned = dir </> (toolname ++ versionSuffix) <.> exeExtension
guessVersioned = dir </> (toolname ++ versionSuffix)
<.> exeExtension
guesses | null versionSuffix = [guessNormal]
| otherwise = [guessGhcVersioned,
guessVersioned,
......@@ -316,7 +317,8 @@ configureToolchain ghcProg ghcInfo =
| ghcVersion >= Version [6,12] [] = mingwBinDir </> binPrefix ++ "ar.exe"
| otherwise = libDir </> "ar.exe"
extraStripPath
| ghcVersion >= Version [6,12] [] = mingwBinDir </> binPrefix ++ "strip.exe"
| ghcVersion >= Version [6,12] [] = mingwBinDir </> binPrefix ++
"strip.exe"
| otherwise = libDir </> "strip.exe"
findProg :: Program -> FilePath
......@@ -675,9 +677,11 @@ buildOrReplLib forRepl verbosity pkg_descr lbi lib clbi = do
let pref = buildDir lbi
pkgid = packageId pkg_descr
whenVanillaLib forceVanilla = when (not forRepl && (forceVanilla || withVanillaLib lbi))
whenVanillaLib forceVanilla =
when (not forRepl && (forceVanilla || withVanillaLib lbi))
whenProfLib = when (not forRepl && withProfLib lbi)
whenSharedLib forceShared = when (not forRepl && (forceShared || withSharedLib lbi))
whenSharedLib forceShared =
when (not forRepl && (forceShared || withSharedLib lbi))
whenGHCiLib = when (not forRepl && withGHCiLib lbi && withVanillaLib lbi)
ifReplLib = when forRepl
comp = compiler lbi
......@@ -721,9 +725,10 @@ buildOrReplLib forRepl verbosity pkg_descr lbi lib clbi = do
ghcOptObjSuffix = toFlag "dyn_o",
ghcOptExtra = ghcSharedOptions libBi
}
replOpts = vanillaOpts {
ghcOptExtra = filterGhciFlags (ghcOptExtra vanillaOpts)
ghcOptExtra = filterGhciFlags
(ghcOptExtra vanillaOpts)
}
`mappend` mempty {
ghcOptMode = toFlag GhcModeInteractive,
......@@ -771,8 +776,9 @@ buildOrReplLib forRepl verbosity pkg_descr lbi lib clbi = do
whenProfLib (runGhcProg profCcOpts)
| filename <- cSources libBi]
--TODO: problem here is we need the .c files built first, so we can load them
-- with ghci, but .c files can depend on .h files generated by ghc by ffi exports.
-- TODO: problem here is we need the .c files built first, so we can load them
-- with ghci, but .c files can depend on .h files generated by ghc by ffi
-- exports.
unless (null (libModules lib)) $
ifReplLib (runGhcProg replOpts)
......@@ -964,7 +970,8 @@ buildOrReplExe forRepl verbosity _pkg_descr lbi
ghcOptInputFiles = [exeDir </> x | x <- cObjs]
}
replOpts = baseOpts {
ghcOptExtra = filterGhciFlags (ghcOptExtra baseOpts)
ghcOptExtra = filterGhciFlags
(ghcOptExtra baseOpts)
}
`mappend` linkerOpts
`mappend` mempty {
......@@ -1025,8 +1032,9 @@ buildOrReplExe forRepl verbosity _pkg_descr lbi
runGhcProg opts
| filename <- cSrcs ]
--TODO: problem here is we need the .c files built first, so we can load them
-- with ghci, but .c files can depend on .h files generated by ghc by ffi exports.
-- TODO: problem here is we need the .c files built first, so we can load them
-- with ghci, but .c files can depend on .h files generated by ghc by ffi
-- exports.
when forRepl $ runGhcProg replOpts
-- link:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment