X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=9ff8db44b10134be0f1535f55ceeb4a198b932a7;hb=54ef1c3c9ef6cecd968d5c1ed6ded3a1a201a870;hp=f78948c974bd637e2cabb1c5203e182f9040aead;hpb=79c5c4d19e44c690970c2505d290b2517b1ee263;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index f78948c..9ff8db4 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -39,6 +39,8 @@ TOP=..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/cabal-flags.mk
 
+# Any libraries listed here should also be in ../packages
+
 SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base array packedstring
 SUBDIRS += containers bytestring old-locale old-time filepath directory
 ifeq "$(GhcLibsWithUnix)" "YES"
@@ -67,7 +69,6 @@ SUBDIRS += $(wildcard stm)
 SUBDIRS += $(wildcard xhtml)
 SUBDIRS += $(wildcard cgi)
 SUBDIRS += $(wildcard parallel)
-SUBDIRS_BUILD += $(wildcard ndp)
 SUBDIRS_BUILD += $(wildcard dph/dph-base)
 SUBDIRS_BUILD += $(wildcard dph/dph-prim-interface)
 SUBDIRS_BUILD += $(wildcard dph/dph-prim-seq)
@@ -129,7 +130,7 @@ CONFIGURE_OPTS += --enable-library-profiling
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling
 endif
 
-ifneq "$(findstring $(space)dyn$(space), $(space)$(GhcLibWays)$(space))" ""
+ifeq "$(BuildSharedLibs)" "YES"
 CONFIGURE_OPTS += --enable-shared
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-shared
 endif
@@ -146,7 +147,7 @@ subdirs:
 
 HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
 
-IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages
+IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages
 
 CABAL_GHC_FLAGS = -Wall
 ifeq "$(ghc_ge_605)" "NO"