projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a containers package
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
0c845c9
..
ed2d92a
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-35,15
+35,14
@@
default_target: all
TOP=..
include $(TOP)/mk/boilerplate.mk
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
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.
# 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
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
ifeq "$(SplitObjs)" "YES"
CONFIGURE_OPTS += --enable-split-objs
CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting