summaryrefslogtreecommitdiff
path: root/utils/ghc-cabal
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-04-20 18:51:18 +0100
committerIan Lynagh <ian@well-typed.com>2013-04-20 18:51:18 +0100
commitd65a61dfa99e613a3f16b85e592b1e35270d4098 (patch)
treea574cdab25ea213a13f078edfa05eae3350f1efb /utils/ghc-cabal
parentc91c23300d58e4bd06c0f154e9ade0e1e3c2c21e (diff)
downloadhaskell-d65a61dfa99e613a3f16b85e592b1e35270d4098.tar.gz
Use different exeext variables for each stage; fixes #7709
Currently they are all set to the same value, but when cross-compiling they could be set to different values.
Diffstat (limited to 'utils/ghc-cabal')
-rw-r--r--utils/ghc-cabal/ghc.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk
index ecdef07d1f..987c59ce50 100644
--- a/utils/ghc-cabal/ghc.mk
+++ b/utils/ghc-cabal/ghc.mk
@@ -18,8 +18,9 @@ CABAL_DOTTED_VERSION := $(shell grep "^version:" libraries/Cabal/Cabal/Cabal.cab
CABAL_VERSION := $(subst .,$(comma),$(CABAL_DOTTED_VERSION))
CABAL_CONSTRAINT := --constraint="Cabal == $(CABAL_DOTTED_VERSION)"
-ghc-cabal_DIST_BINARY = utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext)
-ghc-cabal_INPLACE = inplace/bin/ghc-cabal$(exeext)
+ghc-cabal_DIST_BINARY_NAME = ghc-cabal$(exeext0)
+ghc-cabal_DIST_BINARY = utils/ghc-cabal/dist/build/tmp/$(ghc-cabal_DIST_BINARY_NAME)
+ghc-cabal_INPLACE = inplace/bin/ghc-cabal$(ghc-cabal_DIST_BINARY_NAME)
ifneq "$(BINDIST)" "YES"
$(ghc-cabal_INPLACE) : $(ghc-cabal_DIST_BINARY) | $$(dir $$@)/.