X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=bc7099dfeaa89c9fb45704a249d44d6e4c2b8005;hb=1a3efdd6b616f3a101e182f715df5a0e306eb348;hp=7fb6eeaa4e8512170d9261f969302c48f3cdc428;hpb=954804ab61ee91361bb344b09dfe850caacc232b;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 7fb6eea..bc7099d 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -95,15 +95,8 @@ ifeq "$(stage)" ""
 stage=1
 endif
 
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-ifeq "$(stage)" "1"
+# XXX DQ is now the same on all platforms, so get rid of it
 DQ = \"
-else
-DQ = \\\"
-endif
-else
-DQ = \"
-endif
 
 .DUMMY: stage_dir
 stage_dirs :
@@ -425,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
@@ -604,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.