[commit: ghc] wip/nfs-locking: Directory package no longer needs special treatment (1eff9b4)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/1eff9b4e3114eb38e935def533b54ce0235a6331/ghc

>---------------------------------------------------------------

commit 1eff9b4e3114eb38e935def533b54ce0235a6331
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Nov 27 22:18:41 2016 +0000

    Directory package no longer needs special treatment


>---------------------------------------------------------------

1eff9b4e3114eb38e935def533b54ce0235a6331
 hadrian.cabal                      |  1 -
 src/Settings/Default.hs            |  2 --
 src/Settings/Packages/Directory.hs | 12 ------------
 3 files changed, 15 deletions(-)

diff --git a/hadrian.cabal b/hadrian.cabal
index 30ed256..374b5a0 100644
--- a/hadrian.cabal
+++ b/hadrian.cabal
@@ -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
diff --git a/src/Settings/Default.hs b/src/Settings/Default.hs
index 6f56c5d..b5df4b5 100644
--- a/src/Settings/Default.hs
+++ b/src/Settings/Default.hs
@@ -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
diff --git a/src/Settings/Packages/Directory.hs b/src/Settings/Packages/Directory.hs
deleted file mode 100644
index 5b5d96b..0000000
--- a/src/Settings/Packages/Directory.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-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__"