Commit 1eff9b4e authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Directory package no longer needs special treatment

parent 0412d60a
......@@ -89,7 +89,6 @@ executable hadrian
, Settings.Flavours.Quickest
, Settings.Packages.Base
, Settings.Packages.Compiler
, Settings.Packages.Directory
, Settings.Packages.Ghc
, Settings.Packages.GhcCabal
, Settings.Packages.GhcPrim
......
......@@ -29,7 +29,6 @@ import Settings.Builders.Make
import Settings.Builders.Tar
import Settings.Packages.Base
import Settings.Packages.Compiler
import Settings.Packages.Directory
import Settings.Packages.Ghc
import Settings.Packages.GhcCabal
import Settings.Packages.GhcPrim
......@@ -194,7 +193,6 @@ defaultPackageArgs :: Args
defaultPackageArgs = mconcat
[ basePackageArgs
, compilerPackageArgs
, directoryPackageArgs
, ghcPackageArgs
, ghcCabalPackageArgs
, ghcPrimPackageArgs
......
module Settings.Packages.Directory (directoryPackageArgs) where
import GHC
import Predicate
-- TODO: I had to define symbol __GLASGOW_HASKELL__ as otherwise directory.c is
-- effectively empty. I presume it was expected that GHC will be used for
-- compiling all C files, but I don't know why. It seems that directory.c is the
-- only file which requires special treatment when using GCC.
directoryPackageArgs :: Args
directoryPackageArgs = package directory ?
builder Cc ? arg "-D__GLASGOW_HASKELL__"
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