Fix build on cygwin: Normalise slashes in .depend files to be /

[ghc-hetmet.git] / rules / package-config.mk

diff --git a/rules/package-config.mk b/rules/package-config.mk
index 111386e..b68f2e1 100644 (file)
--- a/rules/package-config.mk
+++ b/rules/package-config.mk
@@ -1,3 +1,15 @@
+# -----------------------------------------------------------------------------
+#
+# (c) 2009 The University of Glasgow
+#
+# This file is part of the GHC build system.
+#
+# To understand how the build system works and how to modify it, see
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Architecture
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Modifying
+#
+# -----------------------------------------------------------------------------
+
 
 define package-config # args: $1 = dir, $2 = distdir, $3 = GHC stage
 
@@ -5,7 +17,9 @@ $1_$2_HC = $$(GHC_STAGE$3)
 
 # configuration stuff that depends on which GHC we're building with
 ifeq "$3" "0"
-$1_$2_ghc_ge_609 = $(ghc_ge_609)
+$1_$2_ghc_ge_6102 = $$(ghc_ge_6102)
+$1_$2_ghc_ge_611 = $$(ghc_ge_611)
+$1_$2_ghc_ge_613 = $$(ghc_ge_613)
 $1_$2_HC_CONFIG = $$(GHC_STAGE0)
 $1_$2_HC_CONFIG_DEP =
 $1_$2_GHC_PKG = $$(GHC_PKG)
@@ -15,13 +29,17 @@ $1_$2_HC_MK_DEPEND = $$($1_$2_HC)
 # on cygwin we get a dep on c:/ghc/..., and make gets confused by the :
 $1_$2_HC_MK_DEPEND_DEP =
 $1_$2_HC_DEP =
-ifeq "$$($1_$2_USE_BOOT_LIBS)" "YES"
-$1_$2_HC_PKGCONF = -package-conf $(BOOTSTRAPPING_CONF)
+$1_$2_HC_PKGCONF = -package-conf $$(BOOTSTRAPPING_CONF)
 $1_$2_GHC_PKG_OPTS = --package-conf=$$(BOOTSTRAPPING_CONF)
 $1_$2_CONFIGURE_OPTS += --package-db=$$(TOP)/$$(BOOTSTRAPPING_CONF)
+$1_$2_HC_OPTS += -no-user-package-conf
+ifeq "$(ghc_ge_613)" "YES"
+$1_$2_HC_OPTS += -rtsopts
 endif
 else
-$1_$2_ghc_ge_609 = YES
+$1_$2_ghc_ge_6102 = YES
+$1_$2_ghc_ge_611 = YES
+$1_$2_ghc_ge_613 = YES
 $1_$2_HC_PKGCONF = 
 $1_$2_HC_CONFIG = $$(TOP)/$$(DUMMY_GHC_INPLACE)
 $1_$2_HC_CONFIG_DEP = $$(DUMMY_GHC_INPLACE)
@@ -34,8 +52,10 @@ $1_$2_HC_MK_DEPEND = $$(GHC_STAGE1)
 $1_$2_HC_MK_DEPEND_DEP = $$($1_$2_HC_MK_DEPEND)
 $1_$2_HC_DEP = $$($1_$2_HC)
 $1_$2_HC_OPTS += -no-user-package-conf
+$1_$2_HC_OPTS += -rtsopts
 endif
 
 # Useful later
 $1_$2_SLASH_MODS = $$(subst .,/,$$($1_$2_MODULES))
+
 endef