diff options
| author | simonmar <unknown> | 2005-09-13 12:50:59 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2005-09-13 12:50:59 +0000 |
| commit | 5971cecb8634e95278295c8c563bebd9700509e3 (patch) | |
| tree | ccc948f1ec4fb6104b381fc5133a4ae6a26abbe8 /ghc/lib/compat | |
| parent | 7177663c27f00f7bbeb222f2c92c43d9da0ec308 (diff) | |
| download | haskell-5971cecb8634e95278295c8c563bebd9700509e3.tar.gz | |
[project @ 2005-09-13 12:50:59 by simonmar]
Never use an installed Cabal package when building GHC (except when
bootstrapping in stages 2 & 3). This insulates us from changes the
user may have made to their Cabal installation.
Diffstat (limited to 'ghc/lib/compat')
| -rw-r--r-- | ghc/lib/compat/Makefile | 29 | ||||
| -rw-r--r-- | ghc/lib/compat/compat.mk | 5 |
2 files changed, 11 insertions, 23 deletions
diff --git a/ghc/lib/compat/Makefile b/ghc/lib/compat/Makefile index 95277c4809..9cc039522e 100644 --- a/ghc/lib/compat/Makefile +++ b/ghc/lib/compat/Makefile @@ -41,32 +41,15 @@ UseGhcForCc = YES SRC_HC_OPTS += $(filter-out -D%, $(GhcHcOpts)) ifeq "$(ghc_ge_603)" "YES" -# These modules are all provided in GHC 6.3+ +# These modules are provided in GHC 6.3+ EXCLUDED_SRCS += \ - System/Directory/Internals.hs \ - Distribution/Compat/FilePath.hs \ - Distribution/Compat/ReadP.hs \ - Distribution/GetOpt.hs \ - Distribution/InstalledPackageInfo.hs \ - Distribution/License.hs \ - Distribution/Package.hs \ - Distribution/ParseUtils.hs \ - Distribution/Compiler.hs \ - Distribution/Version.hs \ - Language/Haskell/Extension.hs + System/Directory/Internals.hs SRC_MKDEPENDHS_OPTS += \ - -optdep--exclude-module=System.Directory.Internals \ - -optdep--exclude-module=Distribution.Compat.FilePath \ - -optdep--exclude-module=Distribution.Compat.ReadP \ - -optdep--exclude-module=Distribution.GetOpt \ - -optdep--exclude-module=Distribution.InstalledPackageInfo \ - -optdep--exclude-module=Distribution.License \ - -optdep--exclude-module=Distribution.Package \ - -optdep--exclude-module=Distribution.ParseUtils \ - -optdep--exclude-module=Distribution.Compiler \ - -optdep--exclude-module=Distribution.Version \ - -optdep--exclude-module=Language.Haskell.Extension + -optdep--exclude-module=System.Directory.Internals + +# GHC 6.3+ has Cabal, but we're replacing it: +SRC_HC_OPTS += -ignore-package Cabal endif # Some explicit dependencies, needed because ghc -M can't discover the diff --git a/ghc/lib/compat/compat.mk b/ghc/lib/compat/compat.mk index c85e6df20f..156f03378e 100644 --- a/ghc/lib/compat/compat.mk +++ b/ghc/lib/compat/compat.mk @@ -10,6 +10,11 @@ SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR) SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat +# Do *not* use the installed Cabal: +ifeq "$(ghc_ge_603)" "YES" +SRC_HC_OPTS += -ignore-package Cabal +endif + # And similarly for when booting from .hc files: HC_BOOT_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) HC_BOOT_LIBS += -lghccompat |