fix some types for 64-bit platforms

[ghc-hetmet.git] / compat / Makefile

diff --git a/compat/Makefile b/compat/Makefile
index be078a8..a95e161 100644 (file)
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -60,7 +60,6 @@ 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"
 ifneq "$(ghc_ge_607)" "YES"
 # GHC 6.3+ has Cabal, but we're replacing it:
 SRC_HC_OPTS += -ignore-package Cabal
@@ -68,7 +67,6 @@ SRC_HC_OPTS += -ignore-package Cabal
 # only GHC 6.3+ has -ignore-package
 SRC_HC_OPTS += -ignore-package filepath
 endif
-endif
 
 ifeq "$(ghc_ge_607)" "YES"
 SRC_HC_OPTS += -package directory
@@ -98,7 +96,13 @@ SRC_CC_OPTS += -I$(FPTOOLS_TOP)/libraries/base/cbits -I$(FPTOOLS_TOP)/libraries/
 # Make the #includes in the stubs independent of the current location
 SRC_HC_OPTS += -I$(FPTOOLS_TOP)/libraries
 
-SRC_HC_OPTS +=  -fglasgow-exts -no-recomp
+SRC_HC_OPTS +=  -fglasgow-exts
+
+ifeq "$(ghc_ge_609)" "YES"
+SRC_HC_OPTS += -fforce-recomp
+else
+SRC_HC_OPTS += -no-recomp
+endif
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 Compat/Directory_HC_OPTS += -\#include shlobj.h