X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package-data.mk;h=47bed79ee0e2470e2ba88fea9861adb75141ec65;hb=8a25c54e2df36b3fb40436e5b887dddc3c64ab54;hp=1e2311fbd7fbe2baf3bb5432863c8c18620957ad;hpb=284647dd59e9b036f51950ce24332847a3f932b4;p=ghc-hetmet.git

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 1e2311f..47bed79 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -12,11 +12,15 @@
 
 define build-package-data # args: $1 = dir, $2 = distdir
 
-ifeq "$(BuildSharedLibs)" "YES"
+ifeq "$$(filter p,$$(GhcLibWays))" "p"
+$1_$2_CONFIGURE_OPTS += --enable-library-profiling
+endif
+
+ifeq "$$(filter dyn,$$(GhcLibWays))" "dyn"
 $1_$2_CONFIGURE_OPTS += --enable-shared
 endif
 
-ifeq "$(HSCOLOUR_SRCS)" "YES"
+ifeq "$$(HSCOLOUR_SRCS)" "YES"
 $1_$2_CONFIGURE_OPTS += --with-hscolour="$$(HSCOLOUR)"
 endif
 
@@ -26,6 +30,14 @@ endif
 $1_$2_CONFIGURE_OPTS += --configure-option=CFLAGS="$$(filter-out -Werror,$$(SRC_CC_OPTS)) $$($1_CC_OPTS) $$($1_$2_CC_OPTS)"
 $1_$2_CONFIGURE_OPTS += --configure-option=LDFLAGS="$$(SRC_LD_OPTS) $$($1_LD_OPTS) $$($1_$2_LD_OPTS)"
 
+ifneq "$$(ICONV_INCLUDE_DIRS)" ""
+$1_$2_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="$$(ICONV_INCLUDE_DIRS)"
+endif
+
+ifneq "$$(ICONV_LIB_DIRS)" ""
+$1_$2_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="$$(ICONV_LIB_DIRS)"
+endif
+
 # This rule configures the package, generates the package-data.mk file
 # for our build system, and registers the package for use in-place in
 # the build tree.