X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=56673df423e68f795c7923a9ffb83e368a0ed6b6;hb=c2224a0abd6d8e6b27df4347ed29373df2aeeb1b;hp=b26b348266afbbb7c92fa1000ce0516fa7906afc;hpb=e26880ac914b198bca11a699b77ffa52790615fe;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index b26b348..56673df 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -438,7 +438,10 @@ SRC_HC_OPTS += -package readline -DUSE_READLINE
 PKG_DEPENDS += readline
 endif
 else
-ifeq "$(GhcLibsWithReadline)" "YES"
+-include $(FPTOOLS_TOP)/libraries/readline/config.mk
+# readline's config.mk sets PACKAGE, which we don't want here
+PACKAGE=
+ifeq "$(READLINE_BUILD_PACKAGE)" "yes"
 SRC_HC_OPTS += -package readline -DUSE_READLINE
 PKG_DEPENDS += readline
 endif
@@ -487,7 +490,12 @@ SRC_HC_OPTS += \
 SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 
 # We need System.Posix (or Posix when ghc < 6.2)
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifeq "$(bootstrapped)" "YES"
+SRC_HC_OPTS += -package Win32
+PKG_DEPENDS += Win32
+endif
+else
 ifeq "$(bootstrapped) $(ghc_ge_601)" "NO NO"
 SRC_HC_OPTS += -package posix
 else