[commit: ghc] master: Trim all spaces after 'version:' (1101045)

git at git.haskell.org git at git.haskell.org
Fri Aug 5 07:47:09 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1101045cbdbd6f240fa7e2438d9488822cd604fb/ghc

>---------------------------------------------------------------

commit 1101045cbdbd6f240fa7e2438d9488822cd604fb
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.


>---------------------------------------------------------------

1101045cbdbd6f240fa7e2438d9488822cd604fb
 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