summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-02-17 13:43:50 +0000
committerIan Lynagh <ian@well-typed.com>2013-02-17 13:43:50 +0000
commitc47649412e43e9b89a52ac4ea7c87d842e9c8a74 (patch)
tree7e54ba7a9e7507bc0ae938aa974e5fa966d9381b /rules
parent94914b967be27ae04cdba098d9557bbf161639c5 (diff)
downloadhaskell-c47649412e43e9b89a52ac4ea7c87d842e9c8a74.tar.gz
iOS patch no 2: remove obsolete CROSS_COMPILE variable; #7699
From StephenBlackheath
Diffstat (limited to 'rules')
-rw-r--r--rules/build-package-data.mk4
-rw-r--r--rules/haddock.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 767e4e181e..41f7a02be1 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -105,10 +105,10 @@ $1/$2/package-data.mk : $$(GHC_CABAL_INPLACE) $$($1_$2_GHC_PKG_DEP) $1/$$($1_PAC
# stage1/stage2, or we don't really care about them.
ifneq "$3" "0"
ifneq "$$($1_NO_CHECK)" "YES"
- CROSS_COMPILE="$(CrossCompilePrefix)" "$$(GHC_CABAL_INPLACE)" check $1
+ "$$(GHC_CABAL_INPLACE)" check $1
endif
endif
- CROSS_COMPILE="$(CrossCompilePrefix)" "$$(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
+ "$$(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"
$$(call cmd,$1_$2_GHC_PKG) update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config
diff --git a/rules/haddock.mk b/rules/haddock.mk
index 4dabe3c71f..3a3fed4503 100644
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -42,7 +42,7 @@ endif
ifneq "$$(BINDIST)" "YES"
$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_FILE) : $$(INPLACE_BIN)/haddock$$(exeext) $$(GHC_CABAL_INPLACE) $$($1_$2_HS_SRCS) $$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_DEPS) | $$$$(dir $$$$@)/.
ifeq "$$(HSCOLOUR_SRCS)" "YES"
- CROSS_COMPILE="$(CrossCompilePrefix)" "$$(GHC_CABAL_INPLACE)" hscolour $2 $1
+ "$$(GHC_CABAL_INPLACE)" hscolour $2 $1
endif
"$$(TOP)/$$(INPLACE_BIN)/haddock" \
--odir="$1/$2/doc/html/$$($1_PACKAGE)" \