summaryrefslogtreecommitdiff
path: root/compiler/Makefile
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2008-06-16 14:29:17 +0000
committerIan Lynagh <igloo@earth.li>2008-06-16 14:29:17 +0000
commit0f5e104c36b1dc3d8deeec5fef3d65e7b3a1b5ad (patch)
treecb2319df6f3669fd22e95029a0de98cd308feec4 /compiler/Makefile
parent1363f4121ceaa38ac50eac42381b976f89d5ea96 (diff)
downloadhaskell-0f5e104c36b1dc3d8deeec5fef3d65e7b3a1b5ad.tar.gz
More commandline flag improvements
* Allow -ffoo flags to be deprecated * Mark some -ffoo flags as deprecated * Avoid using deprecated flags in error messages, in the build system, etc * Add a flag to en/disable the deprecated flag warning
Diffstat (limited to 'compiler/Makefile')
-rw-r--r--compiler/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/compiler/Makefile b/compiler/Makefile
index 30ec286013..fdde6f8a4b 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -568,9 +568,13 @@ SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
# -----------------------------------------------------------------------------
# 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,