summaryrefslogtreecommitdiff
path: root/rules/build-package-data.mk
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2009-05-15 09:28:58 +0000
committerSimon Marlow <marlowsd@gmail.com>2009-05-15 09:28:58 +0000
commita140564b8267d2eb6fb0e0c075372fd2a9825336 (patch)
tree4b35d6c736b84a47963e99b33faa74f5ba8ba447 /rules/build-package-data.mk
parent3e180332e69eb3a3eb2c0cb052c39e648887fe49 (diff)
downloadhaskell-a140564b8267d2eb6fb0e0c075372fd2a9825336.tar.gz
cleanup: remove reference to $1_$2_CONFIGURE_FLAGS, which is never used
we also have $1_$2_CONFIGURE_OPTS, which is used.
Diffstat (limited to 'rules/build-package-data.mk')
-rw-r--r--rules/build-package-data.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 2f1a83aca2..53621ed1f8 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -24,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