[commit: ghc] master: Remove some cross-compilation kludges (be66c4e)

Ian Lynagh igloo at earth.li
Sun Apr 21 21:59:29 CEST 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/be66c4ef548a06a3eecc8e1eee0957884ce6ec98

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

commit be66c4ef548a06a3eecc8e1eee0957884ce6ec98
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Apr 21 17:30:48 2013 +0100

    Remove some cross-compilation kludges
    
    I don't think these should be necessary. If something breaks as
    a result then we can look at why.

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

 ghc.mk | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 8e5e7c1..4bd2de3 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -625,28 +625,18 @@ BUILD_DIRS += libraries/integer-gmp/gmp
 BUILD_DIRS += libraries/integer-gmp/mkGmpDerivedConstants
 endif
 
-ifeq "$(CrossCompiling)-$(phase)" "YES-final"
-MAYBE_GHCTAGS=
-MAYBE_HPC=
-MAYBE_RUNGHC=
-else
-MAYBE_GHCTAGS=utils/ghctags
-MAYBE_HPC=utils/hpc
-MAYBE_RUNGHC=utils/runghc
-endif
-
 BUILD_DIRS += utils/haddock
 BUILD_DIRS += utils/haddock/doc
 BUILD_DIRS += compiler
 BUILD_DIRS += utils/hsc2hs
 BUILD_DIRS += utils/ghc-pkg
 BUILD_DIRS += utils/testremove
-BUILD_DIRS += $(MAYBE_GHCTAGS)
+BUILD_DIRS += utils/ghctags
 BUILD_DIRS += utils/dll-split
 BUILD_DIRS += utils/ghc-pwd
 BUILD_DIRS += utils/ghc-cabal
-BUILD_DIRS += $(MAYBE_HPC)
-BUILD_DIRS += $(MAYBE_RUNGHC)
+BUILD_DIRS += utils/hpc
+BUILD_DIRS += utils/runghc
 BUILD_DIRS += ghc
 
 ifneq "$(BINDIST)" "YES"





More information about the ghc-commits mailing list