X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compat%2FMakefile;h=31d998e0f29f276d013ce0a4c8894a4857814fd4;hp=61cc6c04fc1d7c181675c8c38e63cbf55fb80582;hb=e552cfc427d2734b9a9629f2ab1d22f493e775f6;hpb=4c0095c2714063d0b6e31562fd5c0bbe015af980 diff --git a/compat/Makefile b/compat/Makefile index 61cc6c0..31d998e 100644 --- a/compat/Makefile +++ b/compat/Makefile @@ -10,6 +10,7 @@ ALL_DIRS = \ System \ System/FilePath \ System/Directory \ + Trace/Hpc \ cbits SplitObjs=NO @@ -53,13 +54,6 @@ SRC_CC_OPTS += -D__GHC_PATCHLEVEL__=$(GhcPatchLevel) EXCLUDED_SRCS += System/FilePath/Internal.hs ifeq "$(ghc_ge_603)" "YES" -# These modules are provided in GHC 6.3+ -EXCLUDED_SRCS += \ - System/Directory/Internals.hs - -SRC_MKDEPENDHS_OPTS += \ - -optdep--exclude-module=System.Directory.Internals - # GHC 6.3+ has Cabal, but we're replacing it: SRC_HC_OPTS += -ignore-package Cabal @@ -79,6 +73,10 @@ Distribution/ParseUtils.$(way_)o : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/ Distribution/Compiler.$(way_)o : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Compiler.hs Distribution/Version.$(way_)o : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Version.hs Language/Haskell/Extension.$(way_)o : $(FPTOOLS_TOP)/libraries/Cabal/Language/Haskell/Extension.hs +Trace/Hpc/Mix.$(way_)o : $(FPTOOLS_TOP)/libraries/hpc/Trace/Hpc/Mix.hs +Trace/Hpc/Util.$(way_)o : $(FPTOOLS_TOP)/libraries/hpc/Trace/Hpc/Util.hs +Trace/Hpc/Tix.$(way_)o : $(FPTOOLS_TOP)/libraries/hpc/Trace/Hpc/Tix.hs + cbits/unicode.o : $(FPTOOLS_TOP)/libraries/base/cbits/WCsubst.c $(FPTOOLS_TOP)/libraries/base/include/WCsubst.h SRC_CC_OPTS += -I$(FPTOOLS_TOP)/libraries/base/cbits -I$(FPTOOLS_TOP)/libraries/base/include