X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=1e8322b79a88cc7f41607f1dda9522dc2980fb0a;hb=c8a127499b885a7547825fffc21fe8bbcad2bf97;hp=aac594d3e9778cbad026766bb6d3ed248c4118b2;hpb=8b08c15b8ace5a76e341939081fbb6ad2736ddd1;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index aac594d..1e8322b 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -529,16 +529,6 @@ SRC_HC_OPTS += -package Cabal
 PKG_DEPENDS += Cabal
 endif
 
-# We use Text.Regex which is in regex-compat with GHC 6.6+
-ifeq "$(bootstrapped)" "YES"
-SRC_HC_OPTS += -package regex-compat
-PKG_DEPENDS += regex-compat
-else
-ifeq "$(ghc_ge_605)" "YES"
-SRC_HC_OPTS += -package regex-compat
-endif
-endif
-
 ifeq "$(ghc_ge_603)" "YES"
 # Ignore lang, to avoid potential clash with the Generics module if
 # lang happens to be a dependency of some exposed package in the local
@@ -891,7 +881,17 @@ all :: $(GHC_PROG)
 # configuration.  Yeuch... maybe one day this will all be done more cleanly.
 STAMP_PKG_CONF = $(GHC_DRIVER_DIR)/stamp-pkg-conf-$(PACKAGE)
 
-$(GHC_PROG) : libHS$(PACKAGE)$(_way).a main/Main.hs
+ifeq "$(GhcBuildDylibs)" "YES"
+ifeq "$(darwin_TARGET_OS)" "1"
+GhcLibraryName=libHS$(PACKAGE)$(_way)_dyn.dylib
+else
+GhcLibraryName=libHS$(PACKAGE)$(_way)_dyn.so
+endif
+else
+GhcLibraryName=libHS$(PACKAGE)$(_way).a
+endif
+
+$(GHC_PROG) : $(GhcLibraryName) main/Main.hs
 	$(RM) package.conf.inplace
 	$(RM) $(STAMP_PKG_CONF)
 	$(MAKE) $(STAMP_PKG_CONF)