projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX BUILD with ghc-6.2.x
[ghc-hetmet.git]
/
compat
/
Makefile
diff --git
a/compat/Makefile
b/compat/Makefile
index
fe7aa79
..
0e24ccb
100644
(file)
--- a/
compat/Makefile
+++ b/
compat/Makefile
@@
-8,6
+8,7
@@
ALL_DIRS = \
Distribution/Compat \
Language/Haskell \
System \
Distribution/Compat \
Language/Haskell \
System \
+ System/FilePath \
System/Directory \
cbits
System/Directory \
cbits
@@
-48,6
+49,9
@@
SRC_HC_OPTS += $(filter-out -D%, $(GhcHcOpts) $(GhcStage1HcOpts))
# CPP symbol, so we have to do it by hand:
SRC_CC_OPTS += -D__GHC_PATCHLEVEL__=$(GhcPatchLevel)
# CPP symbol, so we have to do it by hand:
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
+
ifeq "$(ghc_ge_603)" "YES"
# These modules are provided in GHC 6.3+
EXCLUDED_SRCS += \
ifeq "$(ghc_ge_603)" "YES"
# These modules are provided in GHC 6.3+
EXCLUDED_SRCS += \
@@
-58,6
+62,9
@@
SRC_MKDEPENDHS_OPTS += \
# 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
+
+# only GHC 6.3+ has -ignore-package
+SRC_HC_OPTS += -ignore-package filepath
endif
# Some explicit dependencies, needed because ghc -M can't discover the
endif
# Some explicit dependencies, needed because ghc -M can't discover the