projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix another "urk! lookup local fingerprint" in nofib/real/bspt/GeomNum.lhs
[ghc-hetmet.git]
/
compiler
/
Makefile
diff --git
a/compiler/Makefile
b/compiler/Makefile
index
d2195c7
..
acace59
100644
(file)
--- a/
compiler/Makefile
+++ b/
compiler/Makefile
@@
-568,9
+568,13
@@
SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
# -----------------------------------------------------------------------------
# Haskell compilations
# -----------------------------------------------------------------------------
# Haskell compilations
-SRC_HC_OPTS += \
- -cpp -fglasgow-exts -fno-generics -Rghc-timing \
- -I. -Iparser -Iutil
+SRC_HC_OPTS += -cpp -fglasgow-exts -Rghc-timing -I. -Iparser -Iutil
+
+ifeq "$(ghc_ge_609)" "NO"
+SRC_HC_OPTS += -fno-generics
+else
+SRC_HC_OPTS += -XNoGenerics
+endif
# Omitted: -I$(GHC_INCLUDE_DIR)
# We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS,
# Omitted: -I$(GHC_INCLUDE_DIR)
# We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS,
@@
-594,13
+598,9
@@
SRC_HC_OPTS += -package Win32
PKG_DEPENDS += Win32
endif
else
PKG_DEPENDS += Win32
endif
else
-ifeq "$(bootstrapped) $(ghc_ge_601)" "NO NO"
-SRC_HC_OPTS += -package posix
-else
SRC_HC_OPTS += -package unix
PKG_DEPENDS += unix
endif
SRC_HC_OPTS += -package unix
PKG_DEPENDS += unix
endif
-endif
# We use the Cabal package in stages 2/3 only; in stage 1 we're using
# the libcompat library which provides the Cabal modules.
# We use the Cabal package in stages 2/3 only; in stage 1 we're using
# the libcompat library which provides the Cabal modules.
@@
-626,7
+626,7
@@
endif
# The standard suffix rule for compiling a Haskell file
# adds these flags to the command line
# The standard suffix rule for compiling a Haskell file
# adds these flags to the command line
-# There used to be a -no-recomp flag on PrimOp, but why?
+# There used to be a -fforce-recomp flag on PrimOp, but why?
# It's an expensive module to recompile!
prelude/PrimOp_HC_OPTS = -H80m
# It's an expensive module to recompile!
prelude/PrimOp_HC_OPTS = -H80m
@@
-1042,7
+1042,7
@@
endif
# careful to recompile stuff you need if you reconfigure or change HsVersions.h.
# Aargh, these don't work properly anyway, because GHC's recompilation checker
# careful to recompile stuff you need if you reconfigure or change HsVersions.h.
# Aargh, these don't work properly anyway, because GHC's recompilation checker
-# just reports "compilation NOT required". Do we have to add -no-recomp for each
+# just reports "compilation NOT required". Do we have to add -fforce-recomp for each
# of these .hs files? I haven't done anything about this yet.
$(odir)/codeGen/Bitmap.$(way_)o : ../includes/MachDeps.h
# of these .hs files? I haven't done anything about this yet.
$(odir)/codeGen/Bitmap.$(way_)o : ../includes/MachDeps.h