Commit 6552aff7 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Minor revision

parent 1eff9b4e
......@@ -8,9 +8,8 @@ ccBuilderArgs = builder Cc ? mconcat
, argSettingList . ConfCcArgs =<< getStage
, cIncludeArgs
, builder (Cc CompileC) ?
mconcat [ arg "-c", arg =<< getInput
, arg "-o", arg =<< getOutput ]
, builder (Cc CompileC) ? mconcat [ arg "-c", arg =<< getInput
, arg "-o", arg =<< getOutput ]
, builder (Cc FindCDependencies) ? do
output <- getOutput
......
......@@ -16,7 +16,6 @@ haddockBuilderArgs = builder Haddock ? do
path <- getBuildPath
version <- getPkgData Version
synopsis <- getPkgData Synopsis
hidden <- getPkgDataList HiddenModules
deps <- getPkgDataList Deps
depNames <- getPkgDataList DepNames
hVersion <- lift . pkgData . Version $ buildPath (vanillaContext Stage2 haddock)
......@@ -31,7 +30,7 @@ haddockBuilderArgs = builder Haddock ? do
, arg $ "--title=" ++ pkgNameString pkg ++ "-" ++ version ++ ": " ++ synopsis
, arg $ "--prologue=" ++ path -/- "haddock-prologue.txt"
, arg $ "--optghc=-D__HADDOCK_VERSION__=" ++ show (versionToInt hVersion)
, append $ map ("--hide=" ++) hidden
, append . map ("--hide=" ++) =<< getPkgDataList HiddenModules
, append $ [ "--read-interface=../" ++ dep
++ ",../" ++ dep ++ "/src/%{MODULE/./-}.html\\#%{NAME},"
++ pkgHaddockFile (vanillaContext Stage1 depPkg)
......
......@@ -35,8 +35,6 @@ compilerPackageArgs = package compiler ? do
ghciWithDebugger flavour ?
notStage0 ? arg "--ghc-option=-DDEBUGGER"
, ghcProfiled flavour ?
notStage0 ? arg "--ghc-pkg-option=--force"
]
notStage0 ? arg "--ghc-pkg-option=--force" ]
, builder Haddock ? arg ("--optghc=-I" ++ path)
]
, builder Haddock ? arg ("--optghc=-I" ++ path) ]
......@@ -15,12 +15,10 @@ integerGmpPackageArgs = package integerGmp ? do
let includeGmp = "-I" ++ gmpBuildPath -/- "include"
gmpIncludeDir <- getSetting GmpIncludeDir
gmpLibDir <- getSetting GmpLibDir
mconcat [ builder Cc ? arg includeGmp
, builder GhcCabal ? mconcat
[ (null gmpIncludeDir && null gmpLibDir) ?
arg "--configure-option=--with-intree-gmp"
, appendSub "--configure-option=CFLAGS" [includeGmp]
, appendSub "--gcc-options" [includeGmp] ]
]
, appendSub "--gcc-options" [includeGmp] ] ]
......@@ -12,10 +12,10 @@ rtsLibffiLibraryName :: Action FilePath
rtsLibffiLibraryName = do
useSystemFfi <- flag UseSystemFfi
windows <- windowsHost
case (useSystemFfi, windows) of
(True , False) -> return "ffi"
(False, False) -> return "Cffi"
(_ , True ) -> return "Cffi-6"
return $ case (useSystemFfi, windows) of
(True , False) -> "ffi"
(False, False) -> "Cffi"
(_ , True ) -> "Cffi-6"
rtsPackageArgs :: Args
rtsPackageArgs = package rts ? do
......@@ -88,8 +88,7 @@ rtsPackageArgs = package rts ? do
[ "-DTOP=" ++ show top
, "-DFFI_INCLUDE_DIR=" ++ show ffiIncludeDir
, "-DFFI_LIB_DIR=" ++ show ffiLibraryDir
, "-DFFI_LIB=" ++ show libffiName ]
]
, "-DFFI_LIB=" ++ show libffiName ] ]
-- # If we're compiling on windows, enforce that we only support XP+
-- # Adding this here means it doesn't have to be done in individual .c files
......
......@@ -5,7 +5,6 @@ import Oracles.Config.Setting
import Predicate
runGhcPackageArgs :: Args
runGhcPackageArgs = package runGhc ? do
runGhcPackageArgs = package runGhc ? builder Ghc ? input "//Main.hs" ? do
version <- getSetting ProjectVersion
builder Ghc ? input "//Main.hs" ?
append ["-cpp", "-DVERSION=" ++ show version]
append ["-cpp", "-DVERSION=" ++ show version]
Markdown is supported
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