X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compat%2Fcompat.mk;h=4162a6d5a17b4ae5a81da5f55fd6859534e19b1f;hb=596cacfe4e9463d1fd66c3292bef7432cfb1b17a;hp=82a37927cc99a69ef3d8016510ddd0131436084c;hpb=373b03fe979abe898a387e02ca22007b768e343e;p=ghc-hetmet.git diff --git a/compat/compat.mk b/compat/compat.mk index 82a3792..4162a6d 100644 --- a/compat/compat.mk +++ b/compat/compat.mk @@ -19,6 +19,15 @@ ifeq "$(ghc_ge_603)" "YES" SRC_HC_OPTS += -ignore-package Cabal endif +ifeq "$(ghc_ge_607)" "YES" +SRC_HC_OPTS += -package directory +SRC_HC_OPTS += -package pretty +endif + +ifeq "$(ghc_ge_603)" "NO" +SRC_HC_OPTS += -package unix +endif + # And similarly for when booting from .hc files: HC_BOOT_LD_OPTS += -L$(GHC_COMPAT_DIR) HC_BOOT_LIBS += -lghccompat @@ -45,13 +54,21 @@ SRC_MKDEPENDHS_OPTS += \ -optdep--exclude-module=Distribution.ParseUtils \ -optdep--exclude-module=Distribution.Compiler \ -optdep--exclude-module=Distribution.Version \ - -optdep--exclude-module=System.Directory.Internals + -optdep--exclude-module=System.FilePath \ + -optdep--exclude-module=System.FilePath.Posix \ + -optdep--exclude-module=System.FilePath.Windows \ + -optdep--exclude-module=System.Directory.Internals \ + -optdep--exclude-module=Trace.Hpc.Mix \ + -optdep--exclude-module=Trace.Hpc.Tix \ + -optdep--exclude-module=Trace.Hpc.Util PACKAGE_CABAL = +PACKAGE_HPC = else PACKAGE_CABAL = -package Cabal +PACKAGE_HPC = -package hpc endif