Commit 04d44471 authored by Ian Lynagh's avatar Ian Lynagh

Fix building the HEAD with itself

parent f83010b1
......@@ -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.
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment