Update hsc2hs submodule to work around bug in response file handling.
authorklebinger.andreas@gmx.at <klebinger.andreas@gmx.at>
Mon, 22 Oct 2018 17:15:35 +0000 (19:15 +0200)
committerklebinger.andreas@gmx.at <klebinger.andreas@gmx.at>
Mon, 22 Oct 2018 17:15:41 +0000 (19:15 +0200)
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

testsuite/tests/hsc2hs/Makefile
testsuite/tests/hsc2hs/T15758.hsc [new file with mode: 0644]
testsuite/tests/hsc2hs/T15758.response [new file with mode: 0644]
testsuite/tests/hsc2hs/all.T
utils/hsc2hs

index fa668e7..b0751f1 100644 (file)
@@ -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/T15758.hsc b/testsuite/tests/hsc2hs/T15758.hsc
new file mode 100644 (file)
index 0000000..4a47501
--- /dev/null
@@ -0,0 +1,6 @@
+
+module Main (main) where
+
+main :: IO ()
+main = print #size int
+
diff --git a/testsuite/tests/hsc2hs/T15758.response b/testsuite/tests/hsc2hs/T15758.response
new file mode 100644 (file)
index 0000000..ea0d6b1
--- /dev/null
@@ -0,0 +1 @@
+-o T15758.a.hs
index 03dd69a..f237d9a 100644 (file)
@@ -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'])
index 769ac3c..8807b4c 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 769ac3cda8bd766e9a41a74eb681e2de1bac6795
+Subproject commit 8807b4cd9b9efc719828b52cd9aecb9892d3d80b