diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-04-20 18:51:18 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-04-20 18:51:18 +0100 |
| commit | d65a61dfa99e613a3f16b85e592b1e35270d4098 (patch) | |
| tree | a574cdab25ea213a13f078edfa05eae3350f1efb /utils | |
| parent | c91c23300d58e4bd06c0f154e9ade0e1e3c2c21e (diff) | |
| download | haskell-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')
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 5 | ||||
| -rw-r--r-- | utils/runghc/ghc.mk | 2 |
2 files changed, 4 insertions, 3 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 $$@)/. diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk index cde8102312..5a56af5a49 100644 --- a/utils/runghc/ghc.mk +++ b/utils/runghc/ghc.mk @@ -32,7 +32,7 @@ install: install_runhaskell .PHONY: install_runhaskell ifeq "$(Windows_Host)" "YES" install_runhaskell: install_bins - "$(CP)" $(DESTDIR)$(bindir)/runghc$(exeext) $(DESTDIR)$(bindir)/runhaskell$(exeext) + "$(CP)" $(DESTDIR)$(bindir)/runghc$(exeext1) $(DESTDIR)$(bindir)/runhaskell$(exeext1) else install_runhaskell: $(call removeFiles,"$(DESTDIR)$(bindir)/runhaskell") |