X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rules%2Fbuild-package-data.mk;h=9a66d1beb1d8efb198bc561ebb33df36a33180c4;hp=206a6591f91040f9780a30b3c4ae06643ee03149;hb=e5c3b478b3cd1707cf122833822f44b2ac09b8e9;hpb=34cc75e1a62638f2833815746ebce0a9114dc26b

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 206a659..9a66d1b 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -1,16 +1,92 @@
-define build-package-data # args: $1 = dir, $2 = distdir
+# -----------------------------------------------------------------------------
+#
+# (c) 2009 The University of Glasgow
+#
+# This file is part of the GHC build system.
+#
+# To understand how the build system works and how to modify it, see
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Architecture
+#      http://hackage.haskell.org/trac/ghc/wiki/Building/Modifying
+#
+# -----------------------------------------------------------------------------
 
-ifeq "$(HSCOLOUR_SRCS)" "YES"
-$1_$2_CONFIGURE_FLAGS += --with-hscolour="$$(HSCOLOUR)"
+define build-package-data
+$(call trace, build-package-data($1,$2,$3))
+$(call profStart, build-package-data($1,$2,$3))
+# args:
+# $1 = dir
+# $2 = distdir
+# $3 = GHC stage to use (0 == bootstrapping compiler)
+
+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 "$$(GhcWithInterpreter)" "YES"
+$1_$2_CONFIGURE_OPTS += --enable-library-for-ghci
+else
+$1_$2_CONFIGURE_OPTS += --disable-library-for-ghci
+endif
+
+ifeq "$$(HSCOLOUR_SRCS)" "YES"
+$1_$2_CONFIGURE_OPTS += --with-hscolour="$$(HSCOLOUR_CMD)"
 endif
 
+# We filter out -Werror from SRC_CC_OPTS, because when configure tests
+# for a feature it may not generate warning-free C code, and thus may
+# think that the feature doesn't exist if -Werror is on.
+$1_$2_CONFIGURE_OPTS += --configure-option=CFLAGS="$$(filter-out -Werror,$$(SRC_CC_OPTS)) $$(CONF_CC_OPTS_STAGE$3) $$($1_CC_OPTS) $$($1_$2_CC_OPTS)"
+$1_$2_CONFIGURE_OPTS += --configure-option=LDFLAGS="$$(SRC_LD_OPTS) $$(CONF_GCC_LINKER_OPTS_STAGE$3) $$($1_LD_OPTS) $$($1_$2_LD_OPTS)"
+$1_$2_CONFIGURE_OPTS += --configure-option=CPPFLAGS="$$(SRC_CPP_OPTS) $$(CONF_CPP_OPTS_STAGE$3) $$($1_CPP_OPTS) $$($1_$2_CPP_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
+
+ifneq "$$(GMP_INCLUDE_DIRS)" ""
+$1_$2_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="$$(GMP_INCLUDE_DIRS)"
+endif
+
+ifneq "$$(GMP_LIB_DIRS)" ""
+$1_$2_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="$$(GMP_LIB_DIRS)"
+endif
+
+ifeq "$3" "0"
+$1_$2_CONFIGURE_OPTS += $$(BOOT_PKG_CONSTRAINTS)
+endif
+
+$1_$2_CONFIGURE_OPTS += --with-gcc="$$(CC_STAGE$3)"
+$1_$2_CONFIGURE_OPTS += --configure-option=--with-cc="$$(CC_STAGE$3)"
+$1_$2_CONFIGURE_OPTS += --with-ar="$$(AR_STAGE$3)"
+$1_$2_CONFIGURE_OPTS += --with-ranlib="$$(RANLIB)"
+
+ifneq "$$(BINDIST)" "YES"
+ifneq "$$(NO_GENERATED_MAKEFILE_RULES)" "YES"
+$1/$2/inplace-pkg-config : $1/$2/package-data.mk
+$1/$2/build/autogen/cabal_macros.h : $1/$2/package-data.mk
+
 # 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.
-$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
-	if [ "$$($1_$2_PROG)" = "" ]; then \
-	    $$($1_$2_GHC_PKG) update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config; \
-	fi
+$1/$2/package-data.mk : $$(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)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1
+ifeq "$$($1_$2_PROG)" ""
+ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO"
+	"$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config
+endif
+endif
+endif
+endif
+
+PACKAGE_DATA_MKS += $1/$2/package-data.mk
 
+$(call profEnd, build-package-data($1,$2,$3))
 endef