summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-04-21 17:30:48 +0100
committerIan Lynagh <ian@well-typed.com>2013-04-21 17:30:48 +0100
commitbe66c4ef548a06a3eecc8e1eee0957884ce6ec98 (patch)
treed540f2a137c20f686ee94e621ad3fe07b14b1f32 /ghc.mk
parent310735e7adce0145c653386c21686b4a1b96aea9 (diff)
downloadhaskell-be66c4ef548a06a3eecc8e1eee0957884ce6ec98.tar.gz
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.
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk16
1 files changed, 3 insertions, 13 deletions
diff --git a/ghc.mk b/ghc.mk
index 8e5e7c1435..4bd2de3474 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"