[commit: ghc] master: Bump hsc2hs submodule (cec9070)

git at git.haskell.org git at git.haskell.org
Wed Mar 15 19:25:51 UTC 2017


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

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

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

commit cec90709c9c8c2c2955f11b9ad29f4c99bd075db
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Mar 15 11:55:09 2017 -0400

    Bump hsc2hs submodule
    
    Fixes #13388. Also updates the expected output for T12504, which
    previously contained a redundant LINE pragma.


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

cec90709c9c8c2c2955f11b9ad29f4c99bd075db
 testsuite/tests/hsc2hs/Makefile | 2 --
 utils/hsc2hs                    | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/testsuite/tests/hsc2hs/Makefile b/testsuite/tests/hsc2hs/Makefile
index 9b3ee98..fa668e7 100644
--- a/testsuite/tests/hsc2hs/Makefile
+++ b/testsuite/tests/hsc2hs/Makefile
@@ -46,8 +46,6 @@ T12504:
 	'$(HSC2HS)' T12504/path/to/$@.hsc
 ifeq "$(WINDOWS)" "YES"
 	grep '{-# LINE 1 \"T12504\\\\path\\\\to\\\\$@\.hsc\" #-}' T12504/path/to/$@.hs
-	grep '{-# LINE 2 \"T12504\\\\path\\\\to\\\\$@\.hsc\" #-}' T12504/path/to/$@.hs
 else
 	grep '{-# LINE 1 \"T12504/path/to/$@\.hsc\" #-}' T12504/path/to/$@.hs
-	grep '{-# LINE 2 \"T12504/path/to/$@\.hsc\" #-}' T12504/path/to/$@.hs
 endif
diff --git a/utils/hsc2hs b/utils/hsc2hs
index 9e4da90..df6b31d 160000
--- a/utils/hsc2hs
+++ b/utils/hsc2hs
@@ -1 +1 @@
-Subproject commit 9e4da90b7f47c23a2989cba6083fc6ed3880790f
+Subproject commit df6b31d701f8292c3845292004122b5e72f95cad



More information about the ghc-commits mailing list