[commit: ghc] master: Update hsc2hs submodule to work around bug in response file handling. (fce07c9)

git at git.haskell.org git at git.haskell.org
Mon Oct 22 17:19:26 UTC 2018


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

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

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

commit fce07c99fa6528e95892604edb73fb975d6a01fc
Author: klebinger.andreas at gmx.at <klebinger.andreas at gmx.at>
Date:   Mon Oct 22 19:15:35 2018 +0200

    Update hsc2hs submodule to work around bug in response file handling.
    
    Summary:
    This works around #15758 by bumping hsc2hs.
    
    The new version includes support for response files
    independent of the boot compiler.
    
    Test Plan: ci, building formerly broken packages
    
    Reviewers: bgamari, RyanGlScott, ckoparkar
    
    Reviewed By: ckoparkar
    
    Subscribers: rwbarton, carter
    
    GHC Trac Issues: #15758
    
    Differential Revision: https://phabricator.haskell.org/D5250


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

fce07c99fa6528e95892604edb73fb975d6a01fc
 testsuite/tests/hsc2hs/Makefile                      | 5 +++++
 testsuite/tests/hsc2hs/{hsc2hs001.hsc => T15758.hsc} | 0
 testsuite/tests/hsc2hs/T15758.response               | 1 +
 testsuite/tests/hsc2hs/all.T                         | 3 +++
 utils/hsc2hs                                         | 2 +-
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/hsc2hs/Makefile b/testsuite/tests/hsc2hs/Makefile
index fa668e7..b0751f1 100644
--- a/testsuite/tests/hsc2hs/Makefile
+++ b/testsuite/tests/hsc2hs/Makefile
@@ -49,3 +49,8 @@ ifeq "$(WINDOWS)" "YES"
 else
 	grep '{-# LINE 1 \"T12504/path/to/$@\.hsc\" #-}' T12504/path/to/$@.hs
 endif
+
+.PHONY: T15758
+T15758:
+	'$(HSC2HS)' $@.hsc @T15758.response
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c $@.a.hs
diff --git a/testsuite/tests/hsc2hs/hsc2hs001.hsc b/testsuite/tests/hsc2hs/T15758.hsc
similarity index 100%
copy from testsuite/tests/hsc2hs/hsc2hs001.hsc
copy to testsuite/tests/hsc2hs/T15758.hsc
diff --git a/testsuite/tests/hsc2hs/T15758.response b/testsuite/tests/hsc2hs/T15758.response
new file mode 100644
index 0000000..ea0d6b1
--- /dev/null
+++ b/testsuite/tests/hsc2hs/T15758.response
@@ -0,0 +1 @@
+-o T15758.a.hs
diff --git a/testsuite/tests/hsc2hs/all.T b/testsuite/tests/hsc2hs/all.T
index 03dd69a..f237d9a 100644
--- a/testsuite/tests/hsc2hs/all.T
+++ b/testsuite/tests/hsc2hs/all.T
@@ -16,3 +16,6 @@ test('T10272', [], run_command, ['$MAKE -s --no-print-directory T10272'])
 
 test('T12504', [extra_files(['T12504']), ignore_stdout], run_command,
      ['$MAKE -s --no-print-directory T12504'])
+
+# Make sure response files are read and used.
+test('T15758', [], run_command, ['$MAKE -s --no-print-directory T15758'])
diff --git a/utils/hsc2hs b/utils/hsc2hs
index 769ac3c..8807b4c 160000
--- a/utils/hsc2hs
+++ b/utils/hsc2hs
@@ -1 +1 @@
-Subproject commit 769ac3cda8bd766e9a41a74eb681e2de1bac6795
+Subproject commit 8807b4cd9b9efc719828b52cd9aecb9892d3d80b



More information about the ghc-commits mailing list