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

diff --git a/libraries/Makefile b/libraries/Makefile
index f78948c..818fff0 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -67,7 +67,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 +128,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