diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-07-26 18:16:22 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-07-26 18:16:22 +0000 |
| commit | 04d444716b2e5415fb8f13771e49f1192ef8c8f8 (patch) | |
| tree | 91138d36e87bc55697cef0365bbbd37b9627b2f8 /compat | |
| parent | f83010b119096699d1efef2f7bb45460719c48f9 (diff) | |
| download | haskell-04d444716b2e5415fb8f13771e49f1192ef8c8f8.tar.gz | |
Fix building the HEAD with itself
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/Makefile | 7 | ||||
| -rw-r--r-- | compat/compat.mk | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/compat/Makefile b/compat/Makefile index 31d998e0f2..76566a80a7 100644 --- a/compat/Makefile +++ b/compat/Makefile @@ -54,12 +54,19 @@ SRC_CC_OPTS += -D__GHC_PATCHLEVEL__=$(GhcPatchLevel) EXCLUDED_SRCS += System/FilePath/Internal.hs ifeq "$(ghc_ge_603)" "YES" +ifneq "$(ghc_ge_607)" "YES" # GHC 6.3+ has Cabal, but we're replacing it: SRC_HC_OPTS += -ignore-package Cabal # only GHC 6.3+ has -ignore-package SRC_HC_OPTS += -ignore-package filepath endif +endif + +ifeq "$(ghc_ge_607)" "YES" +SRC_HC_OPTS += -package directory +SRC_HC_OPTS += -package pretty +endif # Some explicit dependencies, needed because ghc -M can't discover the # true dependencies of these stub files. diff --git a/compat/compat.mk b/compat/compat.mk index 9c41e0a42c..66b8299057 100644 --- a/compat/compat.mk +++ b/compat/compat.mk @@ -19,6 +19,11 @@ 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 + # And similarly for when booting from .hc files: HC_BOOT_LD_OPTS += -L$(GHC_COMPAT_DIR) HC_BOOT_LIBS += -lghccompat |