[commit: ghc] ghc-8.0: Trim all spaces after 'version:' (ec6526e)
git at git.haskell.org
git at git.haskell.org
Tue Sep 20 11:15:05 UTC 2016
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-8.0
Link : http://ghc.haskell.org/trac/ghc/changeset/ec6526ea4d5bd92edc39400ea7f7e8d6a1bbd370/ghc
>---------------------------------------------------------------
commit ec6526ea4d5bd92edc39400ea7f7e8d6a1bbd370
Author: Gabor Greif <ggreif at gmail.com>
Date: Fri Aug 5 09:42:09 2016 +0200
Trim all spaces after 'version:'
... that we grep out of libraries/Cabal/Cabal/Cabal.cabal
This is necessary because the file got reformatted
in the 'master' branch.
(cherry picked from commit 1101045cbdbd6f240fa7e2438d9488822cd604fb)
>---------------------------------------------------------------
ec6526ea4d5bd92edc39400ea7f7e8d6a1bbd370
utils/ghc-cabal/ghc.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk
index c06a011..62338ee 100644
--- a/utils/ghc-cabal/ghc.mk
+++ b/utils/ghc-cabal/ghc.mk
@@ -14,7 +14,7 @@
# Euch, hideous hack:
# XXX This should be in a different Makefile
-CABAL_DOTTED_VERSION := $(shell grep "^version:" libraries/Cabal/Cabal/Cabal.cabal | sed "s/^version: //")
+CABAL_DOTTED_VERSION := $(shell grep "^version:" libraries/Cabal/Cabal/Cabal.cabal | sed "s/^version: *//")
CABAL_VERSION := $(subst .,$(comma),$(CABAL_DOTTED_VERSION))
CABAL_CONSTRAINT := --constraint="Cabal == $(CABAL_DOTTED_VERSION)"
More information about the ghc-commits
mailing list