projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX #2049, another problem with the module context on :reload
[ghc-hetmet.git]
/
compat
/
compat.mk
diff --git
a/compat/compat.mk
b/compat/compat.mk
index
a9eadb8
..
4740510
100644
(file)
--- a/
compat/compat.mk
+++ b/
compat/compat.mk
@@
-15,8
+15,12
@@
SRC_HC_OPTS += -i$(GHC_COMPAT_DIR)
SRC_LD_OPTS += -L$(GHC_COMPAT_DIR) -lghccompat
# Do *not* use the installed Cabal:
SRC_LD_OPTS += -L$(GHC_COMPAT_DIR) -lghccompat
# Do *not* use the installed Cabal:
-ifeq "$(ghc_ge_603)" "YES"
SRC_HC_OPTS += -ignore-package Cabal
SRC_HC_OPTS += -ignore-package Cabal
+
+ifeq "$(ghc_ge_607)" "YES"
+SRC_HC_OPTS += -package directory
+SRC_HC_OPTS += -package pretty
+SRC_HC_OPTS += -package containers
endif
# And similarly for when booting from .hc files:
endif
# And similarly for when booting from .hc files:
@@
-50,15
+54,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=System.FilePath.Windows \
-optdep--exclude-module=System.Directory.Internals \
-optdep--exclude-module=Trace.Hpc.Mix \
- -optdep--exclude-module=Trace.Hpc.Util \
- -optdep--exclude-module=Trace.Hpc.Tix
-
+ -optdep--exclude-module=Trace.Hpc.Tix \
+ -optdep--exclude-module=Trace.Hpc.Util
PACKAGE_CABAL =
PACKAGE_CABAL =
+PACKAGE_HPC =
else
PACKAGE_CABAL = -package Cabal
else
PACKAGE_CABAL = -package Cabal
+PACKAGE_HPC = -package hpc
endif
endif