diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-11-27 17:30:00 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-11-27 17:30:00 +0000 |
| commit | 9142c238bd014c45e30fc79eee69fa6ab3f469d8 (patch) | |
| tree | b67c39856302f48740f06894284ad064ddcffadb /utils/ghc-cabal | |
| parent | 71d0e9a03797a194209cb61b7f75c2e1c8ddf237 (diff) | |
| download | haskell-9142c238bd014c45e30fc79eee69fa6ab3f469d8.tar.gz | |
Always enable the archive-loading code
If the GHCi .o lib doesn't exist, load the .a instead
Diffstat (limited to 'utils/ghc-cabal')
| -rw-r--r-- | utils/ghc-cabal/ghc-cabal.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/utils/ghc-cabal/ghc-cabal.hs b/utils/ghc-cabal/ghc-cabal.hs index cce40c51cd..81b47db659 100644 --- a/utils/ghc-cabal/ghc-cabal.hs +++ b/utils/ghc-cabal/ghc-cabal.hs @@ -372,7 +372,8 @@ generate config_args distdir directory variablePrefix ++ "_DEP_CC_OPTS = " ++ unwords (forDeps Installed.ccOptions), variablePrefix ++ "_DEP_LIB_DIRS = " ++ unwords (wrap $ forDeps Installed.libraryDirs), variablePrefix ++ "_DEP_EXTRA_LIBS = " ++ unwords (forDeps Installed.extraLibraries), - variablePrefix ++ "_DEP_LD_OPTS = " ++ unwords (forDeps Installed.ldOptions)] + variablePrefix ++ "_DEP_LD_OPTS = " ++ unwords (forDeps Installed.ldOptions), + variablePrefix ++ "_BUILD_GHCI_LIB = " ++ boolToYesNo (withGHCiLib lbi)] writeFile (distdir ++ "/package-data.mk") $ unlines xs writeFile (distdir ++ "/haddock-prologue.txt") $ if null (description pd) then synopsis pd @@ -380,3 +381,5 @@ generate config_args distdir directory where escape = foldr (\c xs -> if c == '#' then '\\':'#':xs else c:xs) [] wrap = map (\s -> "\'" ++ s ++ "\'") + boolToYesNo True = "YES" + boolToYesNo False = "NO" |