Remove some of the old compat stuff now that we assume GHC 6.4

[ghc-hetmet.git] / compiler / Makefile

diff --git a/compiler/Makefile b/compiler/Makefile
index a7d8452..bc7099d 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -418,6 +418,11 @@ ALL_DIRS += javaGen
 SRC_HC_OPTS += -DJAVA
 endif
 
+ifeq ($(UseLibFFI),YES)
+SRC_HC_OPTS += -DUSE_LIBFFI
+SRC_HSC2HS_OPTS += -DUSE_LIBFFI
+endif
+
 ifeq "$(BootingFromHc)" "YES"
 # HC files are always from a self-booted compiler
 bootstrapped = YES
@@ -597,7 +602,7 @@ endif
 
 utils/Digraph_HC_OPTS          = -fglasgow-exts 
 
-basicTypes/SrcLoc_HC_OPTS      = -funbox-strict-fields
+# basicTypes/SrcLoc_HC_OPTS    = -funbox-strict-fields
 
 # We always optimise some low-level modules, otherwise performance of
 # a non-optimised compiler is severely affected.