From d65a61dfa99e613a3f16b85e592b1e35270d4098 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 20 Apr 2013 18:51:18 +0100 Subject: 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. --- utils/ghc-cabal/ghc.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'utils/ghc-cabal') 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 $$@)/. -- cgit v1.2.1