X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compat%2Fcompat.mk;h=9730bdf5176b0897eec189b35265c4a4d8cdabee;hb=016bac72c041e8589ece82fe86906fc9cf8f950c;hp=62057d1f3ea691f17db8a37e54a97caae9aa0d72;hpb=6ac403be68c9ce9bf6ee6b78b9c70c69454dcde5;p=ghc-hetmet.git diff --git a/compat/compat.mk b/compat/compat.mk index 62057d1..9730bdf 100644 --- a/compat/compat.mk +++ b/compat/compat.mk @@ -19,6 +19,16 @@ 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 +SRC_HC_OPTS += -package containers +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 @@ -48,13 +58,18 @@ SRC_MKDEPENDHS_OPTS += \ -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=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