projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve RULE matching a bit more
[ghc-hetmet.git]
/
compiler
/
Makefile
diff --git
a/compiler/Makefile
b/compiler/Makefile
index
b26b348
..
56673df
100644
(file)
--- a/
compiler/Makefile
+++ b/
compiler/Makefile
@@
-438,7
+438,10
@@
SRC_HC_OPTS += -package readline -DUSE_READLINE
PKG_DEPENDS += readline
endif
else
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
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)
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
ifeq "$(bootstrapped) $(ghc_ge_601)" "NO NO"
SRC_HC_OPTS += -package posix
else