diff options
| -rw-r--r-- | ghc/compiler/Makefile | 2 | ||||
| -rw-r--r-- | ghc/lib/compat/Compat/Directory.hs | 2 | ||||
| -rw-r--r-- | ghc/lib/compat/Makefile | 4 | ||||
| -rw-r--r-- | ghc/lib/compat/System/Directory/Internals.hs | 3 | ||||
| -rw-r--r-- | ghc/lib/compat/System/FilePath.hs | 4 | ||||
| -rw-r--r-- | ghc/utils/ghc-pkg/Makefile | 2 |
6 files changed, 8 insertions, 9 deletions
diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 9c865f43fa..0a2805ab8b 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -527,7 +527,7 @@ SRC_MKDEPENDHS_OPTS += \ -optdep--exclude-module=Distribution.ParseUtils \ -optdep--exclude-module=Distribution.Setup \ -optdep--exclude-module=Distribution.Version \ - -optdep--exclude-module=System.FilePath + -optdep--exclude-module=System.Directory.Internals endif SRC_LD_OPTS += -no-link-chk diff --git a/ghc/lib/compat/Compat/Directory.hs b/ghc/lib/compat/Compat/Directory.hs index 6a9f4dc1be..a1e540a54b 100644 --- a/ghc/lib/compat/Compat/Directory.hs +++ b/ghc/lib/compat/Compat/Directory.hs @@ -26,7 +26,7 @@ module Compat.Directory ( #endif import System.Environment (getEnv) -import System.FilePath +import System.Directory.Internals #if __GLASGOW_HASKELL__ > 600 import Control.Exception ( bracket ) import Control.Monad ( when ) diff --git a/ghc/lib/compat/Makefile b/ghc/lib/compat/Makefile index 39112beb06..6365954fbe 100644 --- a/ghc/lib/compat/Makefile +++ b/ghc/lib/compat/Makefile @@ -21,7 +21,7 @@ ghc_603_plus = $(shell if (test $(GhcCanonVersion) -ge 603); then echo YES; else ifeq "$(ghc_603_plus)" "YES" # These modules are all provided in GHC 6.3+ EXCLUDED_SRCS += \ - System/FilePath.hs \ + System/Directory/Internals.hs \ Distribution/Compat/ReadP.hs \ Distribution/Extension.hs \ Distribution/GetOpt.hs \ @@ -34,7 +34,7 @@ EXCLUDED_SRCS += \ endif # Some explicit dependencies -System/FilePath.$(way_)o : $(FPTOOLS_TOP)/libraries/base/System/FilePath.hs +System/Directory/Internals.$(way_)o : $(FPTOOLS_TOP)/libraries/base/System/Directory/Internals.hs Distribution/Compat/ReadP.$(way_) : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Compat/ReadP.hs Distribution/Extension.$(way_)o : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Extension.hs Distribution/GetOpt.$(way_)o : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/GetOpt.hs diff --git a/ghc/lib/compat/System/Directory/Internals.hs b/ghc/lib/compat/System/Directory/Internals.hs new file mode 100644 index 0000000000..459720347d --- /dev/null +++ b/ghc/lib/compat/System/Directory/Internals.hs @@ -0,0 +1,3 @@ +{-# OPTIONS -cpp #-} +#include "base/System/Directory/Internals.hs" +-- dummy comment diff --git a/ghc/lib/compat/System/FilePath.hs b/ghc/lib/compat/System/FilePath.hs deleted file mode 100644 index 951a3d1675..0000000000 --- a/ghc/lib/compat/System/FilePath.hs +++ /dev/null @@ -1,4 +0,0 @@ -{-# OPTIONS -cpp #-} -#include "base/System/FilePath.hs" - --- dummy comment diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile index c7ee909489..c80ec179af 100644 --- a/ghc/utils/ghc-pkg/Makefile +++ b/ghc/utils/ghc-pkg/Makefile @@ -56,7 +56,7 @@ SRC_MKDEPENDHS_OPTS += \ -optdep--exclude-module=Distribution.ParseUtils \ -optdep--exclude-module=Distribution.Setup \ -optdep--exclude-module=Distribution.Version \ - -optdep--exclude-module=System.FilePath + -optdep--exclude-module=System.Directory.Internals # -----------------------------------------------------------------------------= # Create the Version.hs file |