X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package-data.mk;h=53621ed1f89ff60fc535bcfb50eb1641bae7c703;hb=6efacfe8bcbe66dfc3b52397ccbd34a58890520d;hp=a260138286157ad260bd397817db78a0762c358d;hpb=c59c053f0b8613dd128297ee0b6eef31f001c498;p=ghc-hetmet.git

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index a260138..53621ed 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -12,6 +12,10 @@
 
 define build-package-data # args: $1 = dir, $2 = distdir
 
+ifeq "$(BuildSharedLibs)" "YES"
+$1_$2_CONFIGURE_FLAGS += --enable-shared
+endif
+
 ifeq "$(HSCOLOUR_SRCS)" "YES"
 $1_$2_CONFIGURE_FLAGS += --with-hscolour="$$(HSCOLOUR)"
 endif
@@ -20,7 +24,7 @@ endif
 # for our build system, and registers the package for use in-place in
 # the build tree.
 $1/$2/package-data.mk $1/$2/inplace-pkg-config $1/$2/build/autogen/cabal_macros.h : $$(GHC_CABAL_INPLACE) $$($1_$2_GHC_PKG_DEP) $1/$$($1_PACKAGE).cabal $$(wildcard $1/configure) $$($1_$2_HC_CONFIG_DEP)
-	$$(GHC_CABAL_INPLACE) configure --with-ghc=$$($1_$2_HC_CONFIG) --with-ghc-pkg=$$($1_$2_GHC_PKG) --with-gcc=$$(WhatGccIsCalled) --configure-option=--with-cc=$$(WhatGccIsCalled) $$($1_$2_CONFIGURE_FLAGS) $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1
+	$$(GHC_CABAL_INPLACE) configure --with-ghc=$$($1_$2_HC_CONFIG) --with-ghc-pkg=$$($1_$2_GHC_PKG) --with-gcc=$$(WhatGccIsCalled) --configure-option=--with-cc=$$(WhatGccIsCalled) $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1
 	if [ "$$($1_$2_PROG)" = "" ]; then \
 	    $$($1_$2_GHC_PKG) update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config; \
 	fi