projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PrelInfo is now warning-free
[ghc-hetmet.git]
/
compat
/
Makefile
diff --git
a/compat/Makefile
b/compat/Makefile
index
b09e1c2
..
dafb8a0
100644
(file)
--- a/
compat/Makefile
+++ b/
compat/Makefile
@@
-6,6
+6,7
@@
ALL_DIRS = \
Compat \
Distribution \
Distribution/Compat \
Compat \
Distribution \
Distribution/Compat \
+ Distribution/Simple \
Language/Haskell \
System \
System/FilePath \
Language/Haskell \
System \
System/FilePath \
@@
-22,6
+23,12
@@
NO_INSTALL_LIBRARY = YES
# Avoid building the GHCi lib, since we don't need it
GhcWithInterpreter = NO
# Avoid building the GHCi lib, since we don't need it
GhcWithInterpreter = NO
+# There are lots of warnings in here due to things like modules being
+# imported that, in some versions of GHC, aren't used. Thus we don't
+# give any warnings in here, and therefore validating with -Werror won't
+# make the build fail.
+SRC_HC_OPTS += -w
+
# Needed so that the libraries can #include relative to this directory.
INCLUDE_DIRS=-I. -Iinclude
# Needed so that the libraries can #include relative to this directory.
INCLUDE_DIRS=-I. -Iinclude
@@
-53,14
+60,7
@@
SRC_CC_OPTS += -D__GHC_PATCHLEVEL__=$(GhcPatchLevel)
# This module shouldn't be compiled itself, only #included into other files
EXCLUDED_SRCS += System/FilePath/Internal.hs
# This module shouldn't be compiled itself, only #included into other files
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
-
+ifneq "$(ghc_ge_607)" "YES"
# GHC 6.3+ has Cabal, but we're replacing it:
SRC_HC_OPTS += -ignore-package Cabal
# GHC 6.3+ has Cabal, but we're replacing it:
SRC_HC_OPTS += -ignore-package Cabal
@@
-68,6
+68,11
@@
SRC_HC_OPTS += -ignore-package Cabal
SRC_HC_OPTS += -ignore-package filepath
endif
SRC_HC_OPTS += -ignore-package filepath
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.
System/Directory/Internals.$(way_)o : $(FPTOOLS_TOP)/libraries/directory/System/Directory/Internals.hs
# Some explicit dependencies, needed because ghc -M can't discover the
# true dependencies of these stub files.
System/Directory/Internals.$(way_)o : $(FPTOOLS_TOP)/libraries/directory/System/Directory/Internals.hs
@@
-82,6
+87,7
@@
Distribution/Version.$(way_)o : $(FPTOOLS_TOP)/libraries/Cabal/Distribution/Ver
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
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
cbits/unicode.o : $(FPTOOLS_TOP)/libraries/base/cbits/WCsubst.c $(FPTOOLS_TOP)/libraries/base/include/WCsubst.h