[commit: ghc] master: iOS patch no 2: remove obsolete CROSS_COMPILE variable; #7699 (c476494)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/c47649412e43e9b89a52ac4ea7c87d842e9c8a74

>---------------------------------------------------------------

commit c47649412e43e9b89a52ac4ea7c87d842e9c8a74
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Feb 17 13:43:50 2013 +0000

    iOS patch no 2: remove obsolete CROSS_COMPILE variable; #7699
    
    From StephenBlackheath

>---------------------------------------------------------------

 ghc.mk                      |    2 --
 rules/build-package-data.mk |    4 ++--
 rules/haddock.mk            |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 94d98ab..8a87211 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -929,7 +929,6 @@ ifeq "$(DYNAMIC_BY_DEFAULT)" "YES"
 endif
 	$(foreach p, $(INSTALLED_PKG_DIRS),                           \
 	    $(call make-command,                                      \
-	           CROSS_COMPILE="$(CrossCompilePrefix)"              \
 	           "$(GHC_CABAL_INPLACE)" copy                        \
 	                                  "$(STRIP_CMD)"              \
 	                                  $p $(INSTALL_DISTDIR_$p)    \
@@ -940,7 +939,6 @@ endif
 	"$(INSTALLED_GHC_PKG_REAL)" --force --global-package-db "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install
 	$(foreach p, $(INSTALLED_PKG_DIRS),                           \
 	    $(call make-command,                                      \
-	           CROSS_COMPILE="$(CrossCompilePrefix)"              \
 	           "$(GHC_CABAL_INPLACE)" register                    \
 	                                  "$(INSTALLED_GHC_REAL)"     \
 	                                  "$(INSTALLED_GHC_PKG_REAL)" \
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 767e4e1..41f7a02 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 4dabe3c..3a3fed4 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)" \