[commit: packages/Cabal] ghc-head: Whitespace, 80-col violations. (cf1ccd0)
git at git.haskell.org
git at git.haskell.org
Mon Aug 26 23:31:23 CEST 2013
Repository : ssh://git@git.haskell.org/Cabal
On branch : ghc-head
Link : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=cf1ccd05139b5f532ba4c91692934722a567badd
>---------------------------------------------------------------
commit cf1ccd05139b5f532ba4c91692934722a567badd
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date: Sun Aug 25 02:06:04 2013 +0200
Whitespace, 80-col violations.
>---------------------------------------------------------------
cf1ccd05139b5f532ba4c91692934722a567badd
Cabal/Distribution/Simple/GHC.hs | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/Cabal/Distribution/Simple/GHC.hs b/Cabal/Distribution/Simple/GHC.hs
index c484a83..75ad3bd 100644
--- a/Cabal/Distribution/Simple/GHC.hs
+++ b/Cabal/Distribution/Simple/GHC.hs
@@ -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
@@ -723,7 +727,8 @@ buildOrReplLib forRepl verbosity pkg_descr lbi lib clbi = do
}
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:
More information about the ghc-commits
mailing list