X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compat%2Fcompat.mk;h=4162a6d5a17b4ae5a81da5f55fd6859534e19b1f;hp=c9232f732dea2ad8292aa31b1471dc4409d33b77;hb=b374eb9c4747cbddde9cadbad6a12b15e9ced5c1;hpb=05960aa68358fa6d921f41fe4a00480efe46477a diff --git a/compat/compat.mk b/compat/compat.mk index c9232f7..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 @@ -50,14 +59,16 @@ SRC_MKDEPENDHS_OPTS += \ -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