X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=ed2d92a5817986ff08e99c9f3ac850cf7e01ddba;hb=b008746d6d36518b6e89484379e45c798d944743;hp=0c845c9cf4b1db8aea84b3f2c75e551ed6eecc2c;hpb=8fce302bbaf3d0696ffa5ce98013e47ba6ba6c6c;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 0c845c9..ed2d92a 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -35,15 +35,14 @@ default_target: all
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = base old-locale old-time filepath directory process pretty \
-          hpc template-haskell readline Cabal random haskell98
-
+SUBDIRS = base containers bytestring old-locale old-time filepath directory
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
 endif
 ifeq "$(Windows)" "YES"
 SUBDIRS += $(wildcard Win32)
 endif
+SUBDIRS += process pretty hpc template-haskell readline Cabal random haskell98
 
 # Set GhcBootLibs=YES from the command line to work with just the libraries
 # needed to bootstrap GHC.
@@ -98,6 +97,11 @@ CONFIGURE_OPTS += --enable-library-profiling
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling
 endif
 
+ifneq "$(findstring $(space)dyn$(space), $(space)$(GhcLibWays)$(space))" ""
+CONFIGURE_OPTS += --enable-shared
+CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-shared
+endif
+
 ifeq "$(SplitObjs)" "YES"
 CONFIGURE_OPTS += --enable-split-objs
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting